merged gitignores

13 years ago · 2f1a06b2ee
parent 66576de1b7
commit 2f1a06b2ee
2 changed files with 1 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,7 @@
 # the default generated dir + db file
 data
 owncloud
+config/config.php

 # just sane ignores
 .*.sw[po]
--- a/config/.gitignore
+++ b/config/.gitignore
@ -1,2 +0,0 @@
-#autogenerated
-config.php