commit 36f30fffc65a9f210c7426f64df2057db689e7a5 Author: martinkg <martinkg(a)fedoraproject.org&gt; Date: Sat Dec 9 15:43:48 2017 +0100 Rebuild sources | 4 ---- 1 file changed, 4 deletions(-) --- diff --git a/sources b/sources index 1de741a..8625384 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -<<<<<<< HEAD -9cb3b6a9a534dd7d616698748b75cac8 shotcut-17.11.tar.gz -======= f2d1b4bacdee13bb6b21ee9d38c2e7fc shotcut-17.12.tar.gz ->>>>>>> master