<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7afb2ad00dbf13b359dea75fb5a92c9a04cae2e7">https://github.com/macports/macports-ports/commit/7afb2ad00dbf13b359dea75fb5a92c9a04cae2e7</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 7afb2ad  synergy: Do not conflict with synergy-devel
</span>7afb2ad is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 7afb2ad00dbf13b359dea75fb5a92c9a04cae2e7
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Nov 12 09:38:45 2017 -0600

<span style='display:block; white-space:pre;color:#404040;'>    synergy: Do not conflict with synergy-devel
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    That would prevent users of synergy-devel from receiving synergy as
</span><span style='display:block; white-space:pre;color:#404040;'>    a replacement during upgrade.
</span>---
 sysutils/synergy/Portfile | 1 -
 1 file changed, 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/Portfile b/sysutils/synergy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b9524d..e116613 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/synergy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,6 @@ PortGroup github 1.0
</span> 
 github.setup    symless synergy-core 1.8.8-stable v
 name            synergy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts       synergy-devel
</span> categories      sysutils
 license         GPL-2
 platforms       darwin
</pre><pre style='margin:0'>

</pre>