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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/df42b89afee8694dfc2965a580d50b5dd0ad9223">https://github.com/macports/macports-ports/commit/df42b89afee8694dfc2965a580d50b5dd0ad9223</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 df42b89afee libopenshot: no conflict with openssl10, either
</span>df42b89afee is described below

<span style='display:block; white-space:pre;color:#808000;'>commit df42b89afee8694dfc2965a580d50b5dd0ad9223
</span>Author: Craig Treleaven <ctreleaven@macports.org>
AuthorDate: Fri Jan 22 09:21:08 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    libopenshot: no conflict with openssl10, either
</span>---
 multimedia/libopenshot/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libopenshot/Portfile b/multimedia/libopenshot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db93230951b..8ded11931f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libopenshot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libopenshot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ categories          multimedia devel
</span> license             GPL-3+
 # qt-qtmultimedia, qt-svg, qt-qtwebkit all have OpenSSLException
 # does not link with or use anything else that depends on openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict  openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict  openssl openssl10
</span> platforms           darwin
 maintainers         ctreleaven openmaintainer
 
</pre><pre style='margin:0'>

</pre>