<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/60125e8ce9f4dd73fd3a7481656cb1c5159c94f1">https://github.com/macports/macports-ports/commit/60125e8ce9f4dd73fd3a7481656cb1c5159c94f1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 60125e8ce9f4dd73fd3a7481656cb1c5159c94f1
</span>Author: Vadym-Valdis Yudaiev <judaew@macports.org>
AuthorDate: Sun Aug 21 14:44:15 2022 +0300

<span style='display:block; white-space:pre;color:#404040;'>    neovim{,-devel}: Add conflicts line
</span>---
 editors/neovim-devel/Portfile | 2 ++
 editors/neovim/Portfile       | 2 ++
 2 files changed, 4 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/neovim-devel/Portfile b/editors/neovim-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a31ae93c3f..066407bc58a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/neovim-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/neovim-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +14,8 @@ maintainers             {l2dy @l2dy} {judaew @judaew} \
</span>                         openmaintainer
 license                 Apache-2 Vim GPL-2+
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts               neovim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description             Neovim is a aggressively refactored fork of Vim
 
 long_description \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/neovim/Portfile b/editors/neovim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f5ceb8e9a7b..7756e575327 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/neovim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/neovim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,6 +15,8 @@ maintainers             {raimue @raimue} \
</span>                         openmaintainer
 license                 Apache-2 Vim GPL-2+
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts               neovim-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description             Neovim is a aggressively refactored fork of Vim
 
 long_description \
</pre><pre style='margin:0'>

</pre>