Resolve conflict

[rails.git] / app / views / redactions / edit.html.erb

diff --git a/app/views/redactions/edit.html.erb b/app/views/redactions/edit.html.erb
index 2a5e69d0a51f2664049ac990622be7bf1beae38d..2dd63c9cbda9a85d49c2fab3d47f6b0d517effee 100644 (file)
--- a/app/views/redactions/edit.html.erb
+++ b/app/views/redactions/edit.html.erb
@@ -1,5 +1,8 @@
 <% @title = t 'redaction.edit.title' %>
 <% @title = t 'redaction.edit.title' %>

-<h1><%= t 'redaction.edit.heading' %></h1>
+
+<% content_for :heading do %>
+  <h1><%= t 'redaction.edit.heading' %></h1>
+<% end %>

 
 <%= form_for(@redaction) do |f| %>
   <%= f.error_messages %>
 
 <%= form_for(@redaction) do |f| %>
   <%= f.error_messages %>