From 39ffcbc6a25e1ff4565fff3132be59612073276a Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 6 Nov 2013 11:09:52 -0800
Subject: [PATCH 1/1] Fix merge conflict

---
 app/views/browse/changeset.html.erb | 4 ----
 1 file changed, 4 deletions(-)

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| %>
-- 
2.43.2