commit 076144c07e5c4d752f780ccad177e6d5ec104e2c Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Tue Nov 21 07:09:07 2017 -0600 Fix conflicts with master. sources | 4 ---- 1 file changed, 4 deletions(-) --- diff --git a/sources b/sources index 83dcff4..198f8ce 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -<<<<<<< HEAD -1bb08aef04135d1cc3a842de23b7c519 libopenshot-audio-0.0.3.tar.gz -======= 09cc90dbdc97450b9023ff4a56aa2279 libopenshot-audio-0.1.4.tar.gz ->>>>>>> master