<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/764da88b92e7c5cc9548470a01399225fb1f789e">https://github.com/macports/macports-ports/commit/764da88b92e7c5cc9548470a01399225fb1f789e</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 764da88b92e ffmpeg7: remove conflict
</span>764da88b92e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 764da88b92e7c5cc9548470a01399225fb1f789e
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Wed Jan 1 13:58:40 2025 +0400

<span style='display:block; white-space:pre;color:#404040;'>    ffmpeg7: remove conflict
</span>---
 multimedia/ffmpeg7/Portfile | 1 -
 1 file changed, 1 deletion(-)

<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 8d860dab272..b1af06b0fa1 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,7 +10,6 @@ PortGroup           xcodeversion 1.0
</span> 
 name                ffmpeg7
 set my_name         ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           ffmpeg-devel
</span> 
 version             7.1
 revision            2
</pre><pre style='margin:0'>

</pre>