Ignore config/configuration.yml (#7408).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4787 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.gitignore b/.gitignore
index 853230d740e05aa32784de7b9abe6236d1bda4f2..4100963f5c9eb8030323c58eac486f4ebc3d7d4d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /config/additional_environment.rb
+/config/configuration.yml
 /config/database.yml
 /config/email.yml
 /config/initializers/session_store.rb

diff --git a/.hgignore b/.hgignore
index cded71b384270ed6db16fa7b56178ac6005594da..5f41fda1819ef7ac31b07dcf45d4570a7c1f5aad 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: glob
 
 config/additional_environment.rb
+config/configuration.yml
 config/database.yml
 config/email.yml
 config/initializers/session_store.rb