Fix gitignore and add new data dirs

mcommons · Jan 16, 2013 · 3af59bc · 3af59bc
1 parent c5bbe3b
commit 3af59bc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
-<<<<<<< HEAD
 log/*.log
 tmp/**/*
 .DS_Store
-=======
 config/database.yml
->>>>>>> 4f4f044... Move config/database.yml to database.example.yml, for developer freedom
+db/downloaded_zips/*
+db/2013/zips/
+db/2013/shapes/
+db/2013/sql/