From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 1 Feb 2011 13:48:56 +0000 (+0000)
Subject: Ignore config/configuration.yml (#7408).
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=17595c4e31b1d138f4e5e31fdcdaa9f8f507f344;p=redminele%2Fredmine.git

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 853230d7..4100963f 100644
--- 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 cded71b3..5f41fda1 100644
--- 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