ConflictResolutionTextBug-trunk-r9923.patch

Nayuta Taga, 2012-07-07 06:51

Download (824 Bytes)

View differences:

app/views/issues/_conflict.html.erb (working copy)
21 21
  <% if @notes.present? %>
22 22
  <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br />
23 23
  <% end %>
24
  <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label>
24
  <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)).html_safe %></label>
25 25
</p>
26 26
<p><%= submit_tag l(:button_submit) %></p>