<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b655ec9d1d77505bb2d95ecdd23ecd041720b56a">https://github.com/macports/macports-ports/commit/b655ec9d1d77505bb2d95ecdd23ecd041720b56a</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 b655ec9  apache-ant{,-1.9}: note mutual conflict
</span>b655ec9 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b655ec9d1d77505bb2d95ecdd23ecd041720b56a
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Sat Jul 27 22:17:22 2019 +0900

<span style='display:block; white-space:pre;color:#404040;'>    apache-ant{,-1.9}: note mutual conflict
</span>---
 devel/apache-ant-1.9/Portfile | 2 ++
 devel/apache-ant/Portfile     | 2 ++
 2 files changed, 4 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apache-ant-1.9/Portfile b/devel/apache-ant-1.9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8cf7f8b..6d17aed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apache-ant-1.9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/apache-ant-1.9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,8 @@ set workTarget          ""
</span> use_bzip2               yes
 use_configure           no
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts               apache-ant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build {}
 
 # Ant is installed from the binary (jar) distribution by default. Due to
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apache-ant/Portfile b/devel/apache-ant/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a37e3c0..a11f58c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apache-ant/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/apache-ant/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,8 @@ set workTarget          ""
</span> use_bzip2               yes
 use_configure           no
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts               apache-ant-1.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build {}
 
 # Ant is installed from the binary (jar) distribution by default. Due to
</pre><pre style='margin:0'>

</pre>