[libopenshot] Clean up spec file
commit d058bab1b5ade0af60645cfa48df700c31450ba1
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sat Mar 23 02:11:18 2019 -0400
Clean up spec file
A git conflict marker snuck into the changelog section at some point.
libopenshot.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/libopenshot.spec b/libopenshot.spec
index 049e3be..dd45462 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -216,6 +216,5 @@ sed -e 's|-std=c++11|%{optflags} -std=c++11 %{__global_ldflags}
-Wl,--as-needed|
* Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.3-2
- Rebuilt for FFmpeg 2.4.x
->>>>>>> master
* Tue Jul 15 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.0.3-1
- Initial packaging.