commit f8876b6ccaef5a54528d04e1c868784c42c9fd02
Merge: db28097 a5823c1
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Nov 21 07:08:48 2017 -0600
Fix conflicts with master.
.gitignore | 4 ++++
libopenshot-audio.spec | 31 ++++++++++++++++++++++++++++---
sources | 4 ++++
3 files changed, 36 insertions(+), 3 deletions(-)
---
diff --cc sources
index 9f19d65,198f8ce..83dcff4
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+1bb08aef04135d1cc3a842de23b7c519 libopenshot-audio-0.0.3.tar.gz
++=======
+ 09cc90dbdc97450b9023ff4a56aa2279 libopenshot-audio-0.1.4.tar.gz
++>>>>>>> master