Merge branch 'feature/travis_ci'

[elecoma/elecoma.git] / config / database.yml.mysql

diff --git a/config/database.example.yml.mysql b/config/database.yml.mysql
similarity index 77%
rename from config/database.example.yml.mysql
rename to config/database.yml.mysql
index 7c74ac2..c9689b6 100644 (file)
--- a/config/database.example.yml.mysql
+++ b/config/database.yml.mysql
@@ -1,7 +1,7 @@
 common: &common
-  adapter: mysql
-  username: elecoma
-  password: elecoma
+  adapter: mysql2
+  username: root
+  password:
   host: localhost
   port: 3306
   encoding: utf8