<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/4d62a764a6a405c3dbb608e01d5ef42066a65969">https://github.com/macports/macports-ports/commit/4d62a764a6a405c3dbb608e01d5ef42066a65969</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 4d62a764a6a xonsh: fix variant conflicts
</span>4d62a764a6a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4d62a764a6a405c3dbb608e01d5ef42066a65969
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Nov 18 05:46:09 2021 -0600

<span style='display:block; white-space:pre;color:#404040;'>    xonsh: fix variant conflicts
</span>---
 shells/xonsh/Portfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/xonsh/Portfile b/shells/xonsh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a0577f803b4..c93a7ffcba0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/xonsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/xonsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +25,11 @@ checksums           rmd160  bd839cca3c38edf44dd0d39bf10159632fc4e3a1 \
</span>                     sha256  028a7f29c8d4ce7bb5919635f248602a6639e6297ab6620d1f759b044d07491f \
                     size    12682737
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python37 python38 python39 description {Use Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python36 python38 python39 description {Use Python 3.7} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python36 python37 python39 description {Use Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python36 python37 python38 description {Use Python 3.9} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python36 python37 python38 description {Use Python 3.10} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python37 python38 python39 python310 description {Use Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python36 python38 python39 python310 description {Use Python 3.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python36 python37 python39 python310 description {Use Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python36 python37 python38 python310 description {Use Python 3.9} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python36 python37 python38 python39 description {Use Python 3.10} {}
</span> 
 if {![variant_isset python36] && ![variant_isset python37] \
     && ![variant_isset python38] && ![variant_isset python39] \
</pre><pre style='margin:0'>

</pre>