summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rwxr-xr-xconfig/.gitignore2
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index e0ea724f1ae..33f8e0c524b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
# the default generated dir + db file
data
owncloud
+config/config.php
# just sane ignores
.*.sw[po]
diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100755
index d09f42a2389..00000000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#autogenerated
-config.php