From 7391f3b5cffac583ffdd43ce94ef7d1eb23cbc12 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 2 Feb 2015 09:52:05 +0800
Subject: [PATCH] Merge branch 'szzh' of
 http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

Conflicts:
	config/locales/zh.yml

Signed-off-by: alan <547533434@qq.com>
---
 config/database.yml.example | 52 -------------------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 config/database.yml.example

diff --git a/config/database.yml.example b/config/database.yml.example
deleted file mode 100644
index 2ff6231d4..000000000
--- a/config/database.yml.example
+++ /dev/null
@@ -1,52 +0,0 @@
-# Default setup is given for MySQL with ruby1.9. If you're running Redmine
-# with MySQL and ruby1.8, replace the adapter name with `mysql`.
-# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
-# Line indentation must be 2 spaces (no tabs).
-
-production:
-  adapter: mysql2
-  database: redmine
-  host: localhost
-  username: root
-  password: ""
-  encoding: utf8
-
-development:
-  adapter: mysql2
-  database: redmine_development
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  database: redmine_test
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# PostgreSQL configuration example
-#production:
-#  adapter: postgresql
-#  database: redmine
-#  host: localhost
-#  username: postgres
-#  password: "postgres"
-
-# SQLite3 configuration example
-#production:
-#  adapter: sqlite3
-#  database: db/redmine.sqlite3
-
-# SQL Server configuration example
-#production:
-#  adapter: sqlserver
-#  database: redmine
-#  host: localhost
-#  username: jenkins
-#  password: jenkins