commit 04421be8d2f62166cd3a28237b4582918302c2c5 Author: Martin Gansser <martinkg(a)fedoraproject.org&gt; Date: Thu Feb 1 12:50:10 2018 +0100 Add OpenGL_fix.patch vidcutter.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/vidcutter.spec b/vidcutter.spec index 39e1e30..24bad9d 100644 --- a/vidcutter.spec +++ b/vidcutter.spec @@ -76,6 +76,7 @@ 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