<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/31ec53b073ee2fcba1a02dcd619876a289be3afd">https://github.com/macports/macports-ports/commit/31ec53b073ee2fcba1a02dcd619876a289be3afd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 31ec53b073ee2fcba1a02dcd619876a289be3afd
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Oct 24 13:09:23 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    rsync: declare conflict against rsync-hfscomp
</span>---
 net/rsync/Portfile | 1 +
 1 file changed, 1 insertion(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync/Portfile b/net/rsync/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6155a01ffb4..e6840608990 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/rsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,7 @@
</span> PortSystem          1.0
 
 name                rsync
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           rsync-hfscomp
</span> version             3.2.3
 revision            0
 checksums           rmd160  6eea543c7034f1ef4997f72011d4fcdda2a960da \
</pre><pre style='margin:0'>

</pre>