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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/084cedf065a80f85554fa2f9c7c133597acfd061">https://github.com/macports/macports-ports/commit/084cedf065a80f85554fa2f9c7c133597acfd061</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 084cedf065a pybombs: Fix variant conflicts
</span>084cedf065a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 084cedf065a80f85554fa2f9c7c133597acfd061
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jul 17 12:55:39 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    pybombs: Fix variant conflicts
</span>---
 science/pybombs/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pybombs/Portfile b/science/pybombs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6fdc3bfe45f..3f5bcf342c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pybombs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pybombs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ foreach this_py_version_no_dot ${pythons_suffixes} {
</span>     set py_version_with_dot [join [split ${this_py_version_no_dot} ""] "."]
     set this_description "Use Python ${py_version_with_dot}"
     variant python${this_py_version_no_dot} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        conflicts python${this_conflicts} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts {*}python${this_conflicts} \
</span>         description ${this_description} "
             python.default_version ${this_py_version_no_dot}
             depends_build-append \
</pre><pre style='margin:0'>

</pre>