<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/509f91c9858c8e502c614688acb4a8a35484b5eb">https://github.com/macports/macports-ports/commit/509f91c9858c8e502c614688acb4a8a35484b5eb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 509f91c9858c8e502c614688acb4a8a35484b5eb
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Aug 28 02:06:04 2017 +1000

<span style='display:block; white-space:pre;color:#404040;'>    amarok: remove conflict with deleted port
</span>---
 kde/amarok/Portfile | 1 -
 1 file changed, 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/amarok/Portfile b/kde/amarok/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ab59db6..d77a8f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/amarok/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/amarok/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,6 @@ PortSystem          1.0
</span> PortGroup           kde4    1.1
 
 name                amarok
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           amarok-devel
</span> version             2.6.0
 revision            4
 categories          kde kde4
</pre><pre style='margin:0'>

</pre>