<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b2264a0122c88dbaf8c69d6d3369d806ce07559a">https://github.com/macports/macports-ports/commit/b2264a0122c88dbaf8c69d6d3369d806ce07559a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new b2264a0122c osm-gps-map: resolve conflicts
</span>b2264a0122c is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b2264a0122c88dbaf8c69d6d3369d806ce07559a
</span>Author: Toby Peterson <toby@macports.org>
AuthorDate: Fri Jul 30 10:31:09 2021 -0700

<span style='display:block; white-space:pre;color:#404040;'>    osm-gps-map: resolve conflicts
</span>---
 graphics/osm-gps-map/Portfile | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/osm-gps-map/Portfile b/graphics/osm-gps-map/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fae1622db03..835cf6d3805 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/osm-gps-map/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/osm-gps-map/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,6 @@ license         GPL-2+
</span> categories      graphics
 maintainers     {devans @dbevans} openmaintainer
 platforms       darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<<<<<<< HEAD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-=======
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage        https://nzjrs.github.io/${name}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>->>>>>>> b30c2e96ae6 (osm-gps-map: update to 1.2.0)
</span> 
 description     A GTK+ 3 widget for displaying OpenStreetMap tiles.
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,15 +17,10 @@ long_description \
</span>                 draws a GPS track, and points of interest on a moving map display. \
                 Downloads map data from a number of websites, including openstreetmap.org.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<<<<<<< HEAD
</span> homepage        https://nzjrs.github.io/${name}/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  4ad32044e7ead6557e5bdd640e30e8a8a6ba5c56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  817935920d5e50938a5bbb196f33f4fd05a007306bdf375ffdb3cc30216d82a6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-=======
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  cc7eb9da9b2123aaad5b53fa2441521e35780b2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  14f6f247b824b78c018de784c3303543653dd3558e0e18019d90895695b6b01a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>->>>>>>> b30c2e96ae6 (osm-gps-map: update to 1.2.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums       rmd160  cc7eb9da9b2123aaad5b53fa2441521e35780b2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                sha256  14f6f247b824b78c018de784c3303543653dd3558e0e18019d90895695b6b01a
</span> 
 depends_build   port:pkgconfig \
                 port:autoconf \
</pre><pre style='margin:0'>

</pre>