From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 6 Nov 2013 19:09:52 +0000 (-0800)
Subject: Fix merge conflict
X-Git-Tag: live~4648^2~180
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/39ffcbc6a25e1ff4565fff3132be59612073276a?hp=4baa17511f26d6a1e1cf1bbb343ebc2746b3666d

Fix merge conflict
---

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 97cc3e0db..ac8a47069 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -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| %>