Merge branch 'master' into openid
[rails.git] / test / fixtures / user_preferences.yml
index ab95c357db65ac601504e967e3c9f613bac4d6c6..59ebd0542bd9cdcf672414c30a1ec8d91c43497d 100644 (file)
@@ -1,11 +1,11 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
 a:
-  user: normal_user
+  user_id: 1
   k: "key"
   v: "value"
 
 two:
-  user: normal_user
+  user_id: 1
   k: "some_key"
   v: "some_value"