Merge branch 'master' into notes

[rails.git] / test / fixtures / relation_tags.yml

diff --git a/test/fixtures/relation_tags.yml b/test/fixtures/relation_tags.yml
index f7571c30133d5ed344cf62f84c92bb142bba8a38..31b329ed75c941d4cc9a6d5655ea190608981902 100644 (file)
--- a/test/fixtures/relation_tags.yml
+++ b/test/fixtures/relation_tags.yml
@@ -1,41 +1,41 @@
 t1:
-  id: 1
+  relation_id: 1
   k: 'test'
   v: 'yes'
   version: 1
 
 t2:
-  id: 2
+  relation_id: 2
   k: 'test'
   v: 'yes'
   version: 1
 
 t3:
-  id: 3
+  relation_id: 3
   k: 'test'
   v: 'yes'
   version: 1
 
 mt_1:
-  id: 4
+  relation_id: 4
   k: 'tag1'
   v: 'val1'
   version: 1
 
 mt_2:
-  id: 4
+  relation_id: 4
   k: 'tag2'
   v: 'val2'
   version: 1
 
 mt_3:
-  id: 4
+  relation_id: 4
   k: 'tag3'
   v: 'val3'
   version: 1
 
 mt_4:
-  id: 4
+  relation_id: 4
   k: 'tag4'
   v: 'val4'
   version: 1