<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7d75d753698cdb84688bd52922116d06880ac8a4">https://github.com/macports/macports-ports/commit/7d75d753698cdb84688bd52922116d06880ac8a4</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 7d75d75 py-python-augeas, py-python-augeas05: conflict
</span>7d75d75 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7d75d753698cdb84688bd52922116d06880ac8a4
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Wed May 17 05:48:52 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-python-augeas, py-python-augeas05: conflict
</span>---
python/py-python-augeas/Portfile | 3 ++-
python/py-python-augeas05/Portfile | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-python-augeas/Portfile b/python/py-python-augeas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74f8057..1564a37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-augeas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-augeas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,9 +11,10 @@ maintainers nomaintainer
</span> license LGPL-2.1+
description Python bindings for Augeas
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts py-python-augeas05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage http://pypi.python.org/pypi/${real_name}/
master_sites pypi:p/${real_name}
distname ${real_name}-${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-python-augeas05/Portfile b/python/py-python-augeas05/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9125f87..0736d88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-augeas05/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-augeas05/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,9 +12,10 @@ maintainers nomaintainer
</span> license LGPL-2.1+
description Python bindings for Augeas
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts py-python-augeas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage http://pypi.python.org/pypi/${real_name}/
master_sites pypi:p/${real_name}
distname ${real_name}-${version}
</pre><pre style='margin:0'>
</pre>