Remove unused

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

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 97cc3e0dbba69e0933d6b3e6c975fb40c6fc1abf..08979c2834ed571e0748fc77c61ccd040546b930 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -11,7 +11,7 @@
       end
     %>
   </p>
-  <span>
+  <h4>
     <%
       created_at = distance_of_time_in_words_to_now(@changeset.created_at)
       closed_at = distance_of_time_in_words_to_now(@changeset.closed_at)
@@ -27,7 +27,7 @@
     <% if @changeset.user.data_public? %>
       by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>
     <% end %>
-  </span>
+  </h4>
 </div>
   
 <%=
@@ -47,11 +47,7 @@
 <% end %>
 
 <% unless @ways.empty? %>
-<<<<<<< HEAD
   <div class='browse-section  paginate'>
-=======
-  <div class='browse-section clearfix paginate'>
->>>>>>> groundwork for responsive menu
     <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
     <ul>
       <% @ways.each do |way| %>
@@ -75,7 +71,7 @@
 <% end %>
 
 <div class='browse-section secondary-actions'> 
-  <span><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+  <h4><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
   &middot;
-  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></span>
+  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></h4>
 </div>