Index: app/views/issues/_conflict.html.erb
===================================================================
--- app/views/issues/_conflict.html.erb (revision 9923)
+++ app/views/issues/_conflict.html.erb (working copy)
@@ -21,6 +21,6 @@
<% if @notes.present? %>
<% end %>
-
+
<%= submit_tag l(:button_submit) %>