<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2402ac741d4dbbe3e7a099be52f5fc3aab31831c">https://github.com/macports/macports-ports/commit/2402ac741d4dbbe3e7a099be52f5fc3aab31831c</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 2402ac7  py-protobuf: conflict with py-protobuf3
</span>2402ac7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2402ac741d4dbbe3e7a099be52f5fc3aab31831c
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sun Jan 13 22:03:11 2019 +0100

<span style='display:block; white-space:pre;color:#404040;'>    py-protobuf: conflict with py-protobuf3
</span>---
 python/py-protobuf/Portfile  | 2 ++
 python/py-protobuf3/Portfile | 2 ++
 2 files changed, 4 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-protobuf/Portfile b/python/py-protobuf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1c41e7..dda06ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-protobuf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-protobuf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,8 @@ platforms       darwin
</span> python.versions 27
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts       py${python.version}-protobuf3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     depends_build   port:py${python.version}-google-apputils
     depends_lib     port:protobuf-cpp \
                     port:py${python.version}-setuptools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-protobuf3/Portfile b/python/py-protobuf3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ed692a1..3abef90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-protobuf3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-protobuf3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +45,8 @@ platforms       darwin
</span> python.versions 27 35 36 37
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts       py${python.version}-protobuf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     depends_build   port:py${python.version}-setuptools \
                     port:py${python.version}-absl
 
</pre><pre style='margin:0'>

</pre>