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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6b8b3be5cf8257cd87e4f7a3008ea5df83ea3687">https://github.com/macports/macports-ports/commit/6b8b3be5cf8257cd87e4f7a3008ea5df83ea3687</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 6b8b3be5cf8 py-cython-devel: fix conflicts
</span>6b8b3be5cf8 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6b8b3be5cf8257cd87e4f7a3008ea5df83ea3687
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Fri Nov 11 05:20:50 2022 -0600

<span style='display:block; white-space:pre;color:#404040;'>    py-cython-devel: fix conflicts
</span>---
 python/py-cython-devel/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cython-devel/Portfile b/python/py-cython-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ad1696ea505..71cac81fedf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cython-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cython-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ version             3.0.0a11
</span> revision            0
 github.setup        cython cython ${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           py-cython
</span> 
 categories-append   devel
 license             Apache-2
</pre><pre style='margin:0'>

</pre>