Mercurial > hg > soundsoftware-site
annotate .svn/pristine/cd/cd6291f004c3ed369197e657bfbdca19841b1ad5.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 | 038ba2d95de8 |
children |
rev | line source |
---|---|
Chris@1296 | 1 <h2><%=l(:label_document)%></h2> |
Chris@1296 | 2 |
Chris@1296 | 3 <%= labelled_form_for @document do |f| %> |
Chris@1296 | 4 <%= render :partial => 'form', :locals => {:f => f} %> |
Chris@1296 | 5 <p><%= submit_tag l(:button_save) %></p> |
Chris@1296 | 6 <% end %> |
Chris@1296 | 7 |
Chris@1296 | 8 |