Merge remote-tracking branch 'gstrat/elep' into elep

[django-cas-provider.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3e5e30e..2bed7fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # Python garbage
 *.pyc
 *.egg-info
 # Python garbage
 *.pyc
 *.egg-info

+/build
+/dist

 
 # Mac OS X garbage
 .DS_Store
 
 # Mac OS X garbage
 .DS_Store


@@ -9,3 +11,4 @@
 .tmp*
 /.project
 /.pydevproject
 .tmp*
 /.project
 /.pydevproject

+/.settings