Defect #11341 » ConflictResolutionTextBug-trunk-r9923.patch
| app/views/issues/_conflict.html.erb (working copy) | ||
|---|---|---|
|
<% if @notes.present? %>
|
||
|
<label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br />
|
||
|
<% end %>
|
||
|
<label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label>
|
||
|
<label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)).html_safe %></label>
|
||
|
</p>
|
||
|
<p><%= submit_tag l(:button_submit) %></p>
|
||