Added payment/local_parameters.* to .gitignore

2011-10-03 13:56:56 -07:00 · 2011-10-03 13:56:56 -07:00 · 021fb51b24
parent 2423051df6
commit 021fb51b24
1 changed files with 2 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,6 @@
 *.db
 *.pyc
 *.log
-<<<<<<< HEAD
-settings/me.py
-=======
 settings/me.*
->>>>>>> origin/master
-*.dot
+payment/local_parameters.*
+*.dot