From 2f1a06b2ee8b2022e71d8903fd5ce0ccf2f8c22f Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Mon, 15 Aug 2011 20:43:39 +0200
Subject: [PATCH] merged gitignores

---
 .gitignore        | 1 +
 config/.gitignore | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100755 config/.gitignore

diff --git a/.gitignore b/.gitignore
index e0ea724f1a..33f8e0c524 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 d09f42a238..0000000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#autogenerated
-config.php
-- 
GitLab