view .svn/pristine/02/025612e4a47b7cb1c36f52b9661b0cc1f94b2a45.svn-base @ 1485:c8d3ad483bea redmine-2.4-integration

Fix stray merge markers
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 15 Jan 2014 13:34:12 +0000
parents cbb26bc654de
children
line wrap: on
line source
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
one:
  id: 1
<% for attribute in attributes -%>
  <%= attribute.name %>: <%= attribute.default %>
<% end -%>
two:
  id: 2
<% for attribute in attributes -%>
  <%= attribute.name %>: <%= attribute.default %>
<% end -%>