diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issues/_conflict.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb index dcf4c3f75..d2e2a67c4 100644 --- a/app/views/issues/_conflict.html.erb +++ b/app/views/issues/_conflict.html.erb @@ -21,6 +21,6 @@ <% 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> |