Resolve conflict

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

diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb
index 398debe1eed046cfb0ccd9d706f76eb4ef75fe4a..93839cbe8d5276ef7b50f399e7cd23aefe4e9d7c 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -1,6 +1,8 @@
 <% @title = t('user.list.title') %>
 
-<h1><%= t('user.list.heading') %></h1>
+<% content_for :heading do %>
+  <h1><%= t('user.list.heading') %></h1>
+<% end %>
 
 <% unless @users.empty? %>
   <%= form_tag do %>
@@ -28,7 +30,7 @@
       <%= render :partial => 'user', :collection => @users %>
     </table>
 
-    <div id="user_list_actions">
+    <div id="user_list_actions buttons">
       <%= submit_tag t('user.list.confirm'), :name => "confirm" %>
       <%= submit_tag t('user.list.hide'), :name => "hide" %>
     </div>