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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/95505e336d99db2a1f6ce69ad5c98e9152b2c0c4">https://github.com/macports/macports-ports/commit/95505e336d99db2a1f6ce69ad5c98e9152b2c0c4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 95505e336d99db2a1f6ce69ad5c98e9152b2c0c4
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Dec 13 22:20:26 2020 +1100

<span style='display:block; white-space:pre;color:#404040;'>    py-pil: remove conflict with deleted port
</span>---
 python/py-pil/Portfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pil/Portfile b/python/py-pil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9509501145b..b0c8eec1df7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,9 @@ checksums       md5 fc14a54e1ce02a0225be8854bfba478e \
</span> python.versions 26 27
 
 if {$subport ne $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts       py${python.version}-Pillow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} == 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts   py${python.version}-Pillow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     patchfiles      patch-setup.py pil-2009-raclette-fb7ce579f5f9.diff \
                     patch-PIL-TiffImagePlugin.py.diff \
</pre><pre style='margin:0'>

</pre>