diff options
Diffstat (limited to 'app/views/issues/_conflict.html.erb')
| -rw-r--r-- | app/views/issues/_conflict.html.erb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb index c13ace665..ea4c35d7d 100644 --- a/app/views/issues/_conflict.html.erb +++ b/app/views/issues/_conflict.html.erb @@ -3,6 +3,7 @@ <% if @conflict_journals.present? %> <div class="conflict-details"> <% @conflict_journals.sort_by(&:id).each do |journal| %> + <div class="conflict-journal"> <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p> <% if journal.details.any? %> <ul class="details"> @@ -14,6 +15,7 @@ <div class="wiki"> <%= textilizable(journal, :notes) unless journal.notes.blank? %> </div> + </div> <% end %> </div> <% end %> |