merged gitignore files

10 years ago · da49eeda6e
parent 5d8615a958
commit da49eeda6e
2 changed files with 1 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,4 +4,4 @@
 .*.swp
 _vimrc_local.vim
 .sass-cache
-
+config/config.php
--- a/config/.gitignore
+++ b/config/.gitignore
@ -1 +0,0 @@
 config.php