<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b4476cd0c2e89838e3305712b43b9b9f589eafef">https://github.com/macports/macports-ports/commit/b4476cd0c2e89838e3305712b43b9b9f589eafef</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 b4476cd  tao: remove conflict with removed port libACE
</span>b4476cd is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b4476cd0c2e89838e3305712b43b9b9f589eafef
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Sun Feb 19 20:38:51 2017 -0500

<span style='display:block; white-space:pre;color:#404040;'>    tao: remove conflict with removed port libACE
</span>---
 devel/tao/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/Portfile b/devel/tao/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index edf4e18..8360413 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tao/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tao/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ long_description    The ACE ORB (TAO) is a real-time implementation of CORBA bui
</span>                     shortcomings of conventional ORBs for high-performance and real-time \
                     applications.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           ace libACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           ace
</span> 
 homepage            http://www.cs.wustl.edu/~schmidt/TAO.html
 master_sites        http://download.dre.vanderbilt.edu/previous_versions \
</pre><pre style='margin:0'>

</pre>