From da49eeda6e719d7d9449fcb4cfaed2464100221c Mon Sep 17 00:00:00 2001
From: "Moritz Kaspar Rudert (mortzu)" <me@mortzu.de>
Date: Mon, 8 Sep 2014 08:17:19 +0200
Subject: [PATCH] merged gitignore files

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

diff --git a/.gitignore b/.gitignore
index b2b7f713..30785b84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 .*.swp
 _vimrc_local.vim
 .sass-cache
-
+config/config.php
diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644
index 4f4773fb..00000000
--- a/config/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-config.php