Merge 7922:8377 from trunk.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index d366bc96b3922ed66c0e3f9037044c99932783ae..19b5dd8d5227ae5c04720b61afd9a101661c9cbe 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,8 +13,7 @@
 development:
   adapter: mysql
   database: osm
-  username: openstreetmap
-  password: openstreetmap
+  user: root  
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and
@@ -33,3 +32,4 @@ production:
   username: openstreetmap
   password: openstreetmap
   host: db.openstreetmap.org
+