Merge pull request #2 from udacity/update_django

[osqa.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8c50942e95c2c01ed243bf81e93ec630e8024738..7b7b758727ef4635af387aa9772bfe0efc40897f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,9 @@
 *.pyc
 *.pyc

-*.swp
-*.log
-cache/??
+.pydevproject
+.settings
+.project
+log/django.osqa.log
+tmp/*
+

 osqa.wsgi
 osqa.wsgi

-nbproject

 settings_local.py
 settings_local.py

-.idea
-*.iml
-env
-nbproject
-pip-log.txt
-*.zip
-tmp/*
-forum/upfiles/[^R]*
-.svn