Added payment/local_parameters.* to .gitignore

pull/1/head
Raymond Yee 2011-10-03 13:56:56 -07:00
parent 2423051df6
commit 021fb51b24
1 changed files with 2 additions and 5 deletions

7
.gitignore vendored
View File

@ -1,9 +1,6 @@
*.db *.db
*.pyc *.pyc
*.log *.log
<<<<<<< HEAD
settings/me.py
=======
settings/me.* settings/me.*
>>>>>>> origin/master payment/local_parameters.*
*.dot *.dot