diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-01 15:45:43 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-01 15:45:43 -0300 |
| commit | 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 (patch) | |
| tree | 7e9cab343139c79acc36715f4f24c579a207fbc6 /activerecord/test/fixtures/edges.yml | |
| parent | 6b67df70ab1bc42d9a05571144cdf5614a7d4a6a (diff) | |
| parent | da636809daca9c338200811d3590e446f57c8e81 (diff) | |
| download | rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.tar.gz rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.tar.bz2 rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'activerecord/test/fixtures/edges.yml')
| -rw-r--r-- | activerecord/test/fixtures/edges.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/test/fixtures/edges.yml b/activerecord/test/fixtures/edges.yml index c16c70dd2f..b804f7b6a6 100644 --- a/activerecord/test/fixtures/edges.yml +++ b/activerecord/test/fixtures/edges.yml @@ -1,6 +1,5 @@ <% (1..4).each do |id| %> edge_<%= id %>: - id: <%= id %> source_id: <%= id %> sink_id: <%= id + 1 %> -<% end %>
\ No newline at end of file +<% end %> |