summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 14:06:43 -0300
committerBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 14:06:43 -0300
commit57b1535b08e97f93529e0a8e1de16a538f3c4348 (patch)
treecfe5aa11836ad06816c86d6bfeefdb459204e547 /.gitignore
parente0e1bda9caa8eca3c8b4a2a1487e3d0802dd02a2 (diff)
downloadaskbot-57b1535b08e97f93529e0a8e1de16a538f3c4348.tar.gz
askbot-57b1535b08e97f93529e0a8e1de16a538f3c4348.tar.bz2
askbot-57b1535b08e97f93529e0a8e1de16a538f3c4348.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