<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/44eee02398dfed6552fdc7625922ef95ddb55f4d">https://github.com/macports/macports-ports/commit/44eee02398dfed6552fdc7625922ef95ddb55f4d</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 44eee02398d rc, rtags: Indicate conflict
</span>44eee02398d is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 44eee02398dfed6552fdc7625922ef95ddb55f4d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jan 28 16:41:48 2021 -0600

<span style='display:block; white-space:pre;color:#404040;'>    rc, rtags: Indicate conflict
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/62170
</span>---
 devel/rtags/Portfile | 1 +
 shells/rc/Portfile   | 1 +
 2 files changed, 2 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rtags/Portfile b/devel/rtags/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eb17cf3cd81..490d3f9db45 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rtags/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rtags/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,6 +11,7 @@ categories          devel
</span> platforms           darwin
 license             GPL-3+
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           rc
</span> 
 description         A client/server indexer for c/c++/objc\[++\] with \
                     integration for Emacs based on clang
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/rc/Portfile b/shells/rc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 957db523b1e..811103756b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/rc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/rc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ categories  shells
</span> maintainers nomaintainer
 description A Plan 9 shell
 license     Permissive
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts   rtags
</span> 
 long_description    \
     This is a reimplementation for Unix, by Byron Rakitzis, \
</pre><pre style='margin:0'>

</pre>