groundwork for responsive menu

[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 ac8a47069d4dd208a87de7dd06ca11d33e46ddc0..97cc3e0dbba69e0933d6b3e6c975fb40c6fc1abf 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -47,7 +47,11 @@
 <% end %>
 
 <% unless @ways.empty? %>
 <% end %>
 
 <% unless @ways.empty? %>

+<<<<<<< HEAD

   <div class='browse-section  paginate'>
   <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| %>
     <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
     <ul>
       <% @ways.each do |way| %>