annotate app/views/documents/edit.html.erb @ 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 433d4f72a19b
children
rev   line source
Chris@0 1 <h2><%=l(:label_document)%></h2>
Chris@0 2
Chris@1115 3 <%= labelled_form_for @document do |f| %>
Chris@1115 4 <%= render :partial => 'form', :locals => {:f => f} %>
Chris@1115 5 <p><%= submit_tag l(:button_save) %></p>
Chris@0 6 <% end %>
Chris@0 7
Chris@0 8