diff options
Diffstat (limited to 'app/views/issues/_conflict.html.erb')
| -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 d2e2a67c4..01d668821 100644 --- a/app/views/issues/_conflict.html.erb +++ b/app/views/issues/_conflict.html.erb @@ -18,7 +18,7 @@ </div> <p> <label><%= radio_button_tag 'conflict_resolution', 'overwrite' %> <%= l(:text_issue_conflict_resolution_overwrite) %></label><br /> - <% if @notes.present? %> + <% if @issue.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)).html_safe %></label> |