<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/27df22425a464e9876aa51b509126573b2adbcb4">https://github.com/macports/macports-ports/commit/27df22425a464e9876aa51b509126573b2adbcb4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 27df22425a464e9876aa51b509126573b2adbcb4
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Apr 23 14:01:59 2019 +0100

<span style='display:block; white-space:pre;color:#404040;'>    xorg-server: add conflict with xorg-server-1.18
</span>---
 x11/xorg-server/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/Portfile b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0dca9c1..9f4b252 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem      1.0
</span> PortGroup       compiler_blacklist_versions 1.0
 
 name            xorg-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts       xorg-server-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts       xorg-server-devel xorg-server-1.18
</span> set my_name     xorg-server
 version         1.20.4
 revision        0
</pre><pre style='margin:0'>

</pre>