<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/678e0100a4c07d55750e6dc667492dc26cdab208">https://github.com/macports/macports-ports/commit/678e0100a4c07d55750e6dc667492dc26cdab208</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 678e010  jack: Remove self-conflict
</span>678e010 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 678e0100a4c07d55750e6dc667492dc26cdab208
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Fri Apr 6 09:45:35 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    jack: Remove self-conflict
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This was a remnant from when I was trying to package both jack and jack2
</span><span style='display:block; white-space:pre;color:#404040;'>    in separate ports and is no longer correct.
</span>---
 audio/jack/Portfile | 1 -
 1 file changed, 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/jack/Portfile b/audio/jack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14c7619..621ab1a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/jack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/jack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,6 @@ checksums           rmd160  c51332b467b2dff6084df500539e5136f4214964 \
</span> categories          audio
 maintainers         nomaintainer
 platforms           darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           jack
</span> 
 license             GPL-2 LGPL-2.1
 homepage            http://jackaudio.org/
</pre><pre style='margin:0'>

</pre>