aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/fixtures/members.yml
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-12-18 14:49:02 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-12-18 14:49:02 -0800
commit248391a7e11e9fa5ffe312cb380034691430acc5 (patch)
tree0d151f54139732c417f3d4242e13f1aac64ac858 /activerecord/test/fixtures/members.yml
parent86abd6887dac9ee233740399f9e5758309af512e (diff)
parenta9422cc1db9501a80ecf2c25a5d3b0c4f4f32763 (diff)
downloadrails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.gz
rails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.bz2
rails-248391a7e11e9fa5ffe312cb380034691430acc5.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/test/fixtures/members.yml')
-rw-r--r--activerecord/test/fixtures/members.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/members.yml b/activerecord/test/fixtures/members.yml
index 67a6cc459a..6db945e61d 100644
--- a/activerecord/test/fixtures/members.yml
+++ b/activerecord/test/fixtures/members.yml
@@ -1,4 +1,6 @@
groucho:
name: Groucho Marx
+ member_type_id: 1
some_other_guy:
- name: Englebert Humperdink \ No newline at end of file
+ name: Englebert Humperdink
+ member_type_id: 2