From c860d352a21456ad715757ad70e5b01757ed0e03 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 20 Jan 2016 09:24:32 +0000
Subject: [PATCH] Wrap textilizable with DIV containing wiki class (#21663).

Patch by Felix Gliesche.

git-svn-id: http://svn.redmine.org/redmine/trunk@15071 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_conflict.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb
index 01d668821..c13ace665 100644
--- a/app/views/issues/_conflict.html.erb
+++ b/app/views/issues/_conflict.html.erb
@@ -11,7 +11,9 @@
         <% end %>
       </ul>
       <% end %>
-      <%= textilizable(journal, :notes) unless journal.notes.blank? %>
+      <div class="wiki">
+        <%= textilizable(journal, :notes) unless journal.notes.blank? %>
+      </div>
     <% end %>
     </div>
   <% end %>