commit af6aa31b14c9c72924ed2e1364efb809e908a124 Author: Martin Gansser <martinkg(a)fedoraproject.org&gt; Date: Thu Feb 1 12:53:16 2018 +0100 Add OpenGL_fix.patch vidcutter.spec | 1 - 1 file changed, 1 deletion(-) --- diff --git a/vidcutter.spec b/vidcutter.spec index 24bad9d..39e1e30 100644 --- a/vidcutter.spec +++ b/vidcutter.spec @@ -76,7 +76,6 @@ fi %{_datadir}/pixmaps/%{name}.svg %changelog -<<<<<<< HEAD * Wed Jan 31 2018 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 5.0.5-2 - Add OpenGL_fix.patch