<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8ecf2ba416b5b30012859c6a6d6483cf3f300cc5">https://github.com/macports/macports-ports/commit/8ecf2ba416b5b30012859c6a6d6483cf3f300cc5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8ecf2ba416b5b30012859c6a6d6483cf3f300cc5
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Aug 3 21:03:24 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    ffmpeg7: conflicts ffmpeg-devel
</span>---
 multimedia/ffmpeg7/Portfile | 1 +
 1 file changed, 1 insertion(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg7/Portfile b/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index afca00d1f12..cc7c3afe202 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,6 +10,7 @@ PortGroup           xcodeversion 1.0
</span> 
 name                ffmpeg7
 set my_name         ffmpeg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           ffmpeg-devel
</span> 
 version             7.0.2
 revision            0
</pre><pre style='margin:0'>

</pre>