Resolve conflict

[rails.git] / app / views / user / _user.html.erb

diff --git a/app/views/user/_user.html.erb b/app/views/user/_user.html.erb
index 4f2f59c92d20782576845477d1f5b25c769a52c9..b1ea3f299c053d4e72e39339d38b8e9dd2b9d0e0 100644 (file)
--- a/app/views/user/_user.html.erb
+++ b/app/views/user/_user.html.erb
@@ -19,7 +19,7 @@
         %>
       <% end %>
     </p>
-    <%= user.description.to_html %>
+    <div class="richtext"><%= user.description.to_html %></div>
   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>