Fix merge conflict

[rails.git] / app / views / browse / note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 8e277d25f97b6f794052b11ddbffe7030f48c5a1..c91005b602d1e8d560e52f5055dfb0c8b8790421 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,5 +1,7 @@
-<div class='browse-section header'>
-  <h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
+<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+  <span class="icon close"></span>
+</h2>
+<div class="browse-section">
   <span>
     <%= t "browse.note.opened" %>: 
     <abbr><%= note_event(@note.created_at, @note.author) %></abbr> by