<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/bb9886a74702dd0dee6739086b5c3b84a365945d">https://github.com/macports/macports-ports/commit/bb9886a74702dd0dee6739086b5c3b84a365945d</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 bb9886a7470 py-scikit-hep-awkward{1}: Add appropriate conflicts
</span>bb9886a7470 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit bb9886a74702dd0dee6739086b5c3b84a365945d
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Feb 28 09:51:21 2023 +0000

<span style='display:block; white-space:pre;color:#404040;'>    py-scikit-hep-awkward{1}: Add appropriate conflicts
</span>---
 python/py-scikit-hep-awkward/Portfile  | 4 +++-
 python/py-scikit-hep-awkward1/Portfile | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikit-hep-awkward/Portfile b/python/py-scikit-hep-awkward/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08de04e4afd..751b9777c57 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scikit-hep-awkward/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scikit-hep-awkward/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,12 +23,14 @@ long_description    {*}${description}
</span> python.versions     37 38 39 310 311
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts       py${python.version}-scikit-hep-awkward1
</span>     
     post-fetch {
         system -W ${worksrcpath} "git submodule update --init --recursive"
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    python.pep517  yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    python.pep517   yes
</span> 
     compiler.cxx_standard 2011
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikit-hep-awkward1/Portfile b/python/py-scikit-hep-awkward1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a0305de0db..f166ab226cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scikit-hep-awkward1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scikit-hep-awkward1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,8 @@ long_description    {*}${description}
</span> python.versions     37 38 39 310 311
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts           py${python.version}-scikit-hep-awkward
</span>     
     post-fetch {
         system -W ${worksrcpath} "git submodule update --init --recursive"
</pre><pre style='margin:0'>

</pre>