summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 14:07:07 -0300
committerBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 14:07:07 -0300
commit0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5 (patch)
treecfe5aa11836ad06816c86d6bfeefdb459204e547 /.gitignore
parentbe1b6a28517b94da64ce48f8c2be598488848202 (diff)
downloadaskbot-0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5.tar.gz
askbot-0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5.tar.bz2
askbot-0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5.zip
Removed settings_local.py to be able to merge.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a4fc0520..02ec314a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ settings_local.py
*.pyc
*.swp
*.log
+settings_local.py
nbproject