X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/582ab35ecd0b0cfacaedf8cbe1d6eadff302973b..39ffcbc6a25e1ff4565fff3132be59612073276a:/app/views/browse/changeset.html.erb 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