Repair broken merge and merge again

pnorman / openstreetmap-carto

A project to re-implement the standard OpenStreetMap mapnik style, in CartoCSS

Other

1 stars 0 forks source link

Closed matthijsmelissen closed 9 years ago

matthijsmelissen commented 9 years ago

pnorman commented 9 years ago

I'll probably do this as a squish commit and rebase

matthijsmelissen commented 9 years ago

Done in 7af7a3157596866398fec985b20dcfea43720089 and following.