Fix merge conflict

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

diff --git a/app/views/redactions/new.html.erb b/app/views/redactions/new.html.erb
index c714acdbc959945de41dea5ba54c8eb3b1405608..5004c0e1e8178a6247fe37f8ae6f83995ebbf5e1 100644 (file)
--- a/app/views/redactions/new.html.erb
+++ b/app/views/redactions/new.html.erb
@@ -1,5 +1,7 @@
 <% @title = t 'redaction.new.title' %>
 <% @title = t 'redaction.new.title' %>

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

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