cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict

Browse source
This commit is contained in:
John Firebaugh 2013-11-06 11:09:52 -08:00
parent 4baa17511f
commit 39ffcbc6a2
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/browse/changeset.html.erb
View file

@ -47,11 +47,7 @@
<% end %> <% end %>
<% unless @ways.empty? %> <% 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> <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
<ul> <ul>
<% @ways.each do |way| %> <% @ways.each do |way| %>