Merged 8899:9136 and 9145 from trunk.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index 709a78c63eaeab9dafb341201e026dcc0b56b532..b884f3b938fea8c5ea541e0d4af5fbbc16529dd7 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,8 +13,8 @@
 development:
   adapter: mysql
   database: openstreetmap
-  username: whatever 
-  password: whatever 
+  username: openstreetmap
+  password: openstreetmap
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and