commit 6881056577b1fd53279529ebc49bd26dee4dee63 Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Thu Dec 6 22:53:29 2018 +0100 Rebuild for ffmpeg-3.4.5 on el7 sources | 4 ---- 1 file changed, 4 deletions(-) --- diff --git a/sources b/sources index 4a8b947..9c39b52 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -<<<<<<< HEAD -33d0cd47cb84a4e9f4e1b3160405c85c avidemux_2.6.8.tar.gz -======= e3510c858c9371283551b1b4b67d288b avidemux_2.7.1.tar.gz ->>>>>>> master