<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c30f07e45289b6a08b40d28ae66e408359b20d85">https://github.com/macports/macports-ports/commit/c30f07e45289b6a08b40d28ae66e408359b20d85</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c30f07e45289b6a08b40d28ae66e408359b20d85
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed Apr 19 09:48:02 2017 +0000

<span style='display:block; white-space:pre;color:#404040;'>    msgpack, msgpack1: fix conflicts
</span>---
 devel/msgpack/Portfile  | 2 +-
 devel/msgpack1/Portfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/msgpack/Portfile b/devel/msgpack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00806fd..7f53ca0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/msgpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/msgpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ license             Apache-2
</span> checksums           rmd160  c708651d37d62fa8e1fb18cadbce129fd838b777 \
                     sha256  edfe42e4a9199b9e6c05d421c087a0de8575d045cae88df0873ed9158a9494e0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           port:msgpack1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           msgpack1
</span> 
 depends_build       port:autoconf port:automake port:libtool
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/msgpack1/Portfile b/devel/msgpack1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a146a6c..8476129 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/msgpack1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/msgpack1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums           rmd160  67d03587f5d8e094200bd67bc12d5ebb773bb9f8 \
</span> 
 dist_subdir         msgpack
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           port:msgpack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           msgpack
</span> 
 depends_build       port:autoconf port:automake port:libtool
 
</pre><pre style='margin:0'>

</pre>