Resolve conflict

[rails.git] / app / views / user_blocks / index.html.erb

diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index 2baf91e5f25559e7975e281333d35c3b98805a96..8cf7e81b753a81e1b6b765a3350d137eed4a83f4 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -1,5 +1,7 @@
 <% @title = t('user_block.index.title') %>
 <% @title = t('user_block.index.title') %>

-<h1><%= t('user_block.index.heading') %></h1>
+<% content_for :heading do %>
+  <h1><%= t('user_block.index.heading') %></h1>
+<% end %>

 
 <% unless @user_blocks.empty? %>
 <%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %>
 
 <% unless @user_blocks.empty? %>
 <%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %>