merge upstream/master and resolve conflicts from https://github.com/openstreetmap...

[rails.git] / app / assets / images / marker-yellow.png

diff --git a/app/assets/images/marker-yellow.png b/app/assets/images/marker-yellow.png
index 5e56a452629a74d8f4093edb1e65975da26a1894..394aa5341045b396cace3662b317497d6b91a88d 100644 (file)
Binary files a/app/assets/images/marker-yellow.png and b/app/assets/images/marker-yellow.png differ