<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/f2520d6a08e832cdb831f841bbfff3abd44362f8">https://github.com/macports/macports-ports/commit/f2520d6a08e832cdb831f841bbfff3abd44362f8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f2520d6a08e832cdb831f841bbfff3abd44362f8
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed Apr 19 09:59:49 2017 +0000

<span style='display:block; white-space:pre;color:#404040;'>    py-meta: fix conflicts
</span>---
 python/py-meta/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meta/Portfile b/python/py-meta/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4667f8e..1ad5a04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meta/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meta/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ checksums           rmd160  894cd7c3c91b923e7d61b6b485278702566a587e \
</span>                     sha256  58d2c012beea9f2aaea82fbf67d0d6b3124e66c79cbc31829beb2005c3372885
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts           port:py${python.version}-meta-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts           py${python.version}-meta-devel
</span> 
     depends_lib-append  port:py${python.version}-setuptools
 
</pre><pre style='margin:0'>

</pre>