summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Kaspar Rudert (mortzu) <me@mortzu.de>2014-09-08 08:17:19 +0200
committerMoritz Kaspar Rudert (mortzu) <me@mortzu.de>2014-09-08 08:17:19 +0200
commitda49eeda6e719d7d9449fcb4cfaed2464100221c (patch)
tree8cea52b57c5185ac0d88178624745143b7ee7cf6
parent5d8615a958b20c59a7ed00be0aa2ef8f2f9cc233 (diff)
merged gitignore files
-rw-r--r--.gitignore2
-rw-r--r--config/.gitignore1
2 files changed, 1 insertions, 2 deletions
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