From 6df08f6b9aba85f2d248b8d48156b57a955a9209 Mon Sep 17 00:00:00 2001
From: Daniel Reichelt <hacking@nachtgeist.net>
Date: Sun, 19 Jun 2016 16:56:53 +0200
Subject: [PATCH] don't split .gitignore

they would end up in .deb packages
---
 .gitignore           | 12 +++++++++---
 lib/.gitignore       |  1 -
 templates/.gitignore |  4 ----
 3 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 lib/.gitignore
 delete mode 100644 templates/.gitignore

diff --git a/.gitignore b/.gitignore
index 0ef4964b..a87df6c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-templates/*
-logs/*
 install/update.log
+templates/*
+lib/userdata.inc.php
+logs/*
 .buildpath
 .project
 .settings/
@@ -8,4 +9,9 @@ install/update.log
 *~
 .well-known
 .idea
-*.iml
\ No newline at end of file
+*.iml
+
+!templates/Froxlor/
+!templates/Sparkle/
+!templates/misc/
+templates/Froxlor/assets/img/logo_custom.png
diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644
index 015be9fe..00000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-userdata.inc.php
diff --git a/templates/.gitignore b/templates/.gitignore
deleted file mode 100644
index 33c4d146..00000000
--- a/templates/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-!Froxlor/
-!Sparkle/
-Froxlor/assets/img/logo_custom.png
-!misc/