search

pnorman / openstreetmap-carto

A project to re-implement the standard OpenStreetMap mapnik style, in CartoCSS
Other
1 stars 0 forks source link

Merge branch 'master' into buildings_rewrite #3

Closed matthijsmelissen closed 9 years ago

matthijsmelissen commented 9 years ago

Merge changes from master up to 555c8689a232394cf2e4cd060c03d285a9cee7ca.

pnorman commented 9 years ago

fc88e974f31d8257fc244280313d22af05c60ab1 went awry - did you fix that?

matthijsmelissen commented 9 years ago

I'm not sure what you mean. I just did a merge from master. Should I peel off the previous merge and merge again?

pnorman commented 9 years ago

https://github.com/gravitystorm/openstreetmap-carto/pull/565#issuecomment-51320186 explains how the merge conflicts went wrong in fc88e97

matthijsmelissen commented 9 years ago

Thanks, I wrote a new PR that also fixed the merge, see previous #4.