FIX: conflict in settings.py

[myslice.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 048f538..d2fb6c4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,17 @@
+# any local dbfile
+*.sqlite3
+# here is a mode to 'record' the backend answers and replay them offline
+offline-*
+# the usual useless crap
 TAGS
 *.pyc
-*.sqlite3
 *~
+# these essentially are copies/links from other places
 all-static/
-DataTables-1.9.4/
+all-templates/
+django-static/
+# various working files
+play/
+*.leftovers
+*.hide
+entrypoints.ongoing/