From 1acf56f997c2ed95bac6f9a1bd1e940a3c860ccc Mon Sep 17 00:00:00 2001
From: Felix Gliesche <felix.gliesche@plan.io>
Date: Thu, 7 Jan 2016 16:39:56 +0100
Subject: [PATCH] Wrap textilizable with DIV containing wiki class

---
 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 01d6688..c13ace6 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 %>
-- 
1.9.3 (Apple Git-50)