cleaner database.yml

2014-09-05 15:46:13 -07:00
parent 8a7aa23511 aca1a9d955
commit 02e29e953a
5 changed files with 356 additions and 321 deletions
@@ -68,4 +68,5 @@ brakeman.html
 # Ignore sensitive data
 /config/settings/local.rb
 /nbproject/private/
-/config/database.yml
+<<<<<<< HEAD
+/config/database.yml