commit 8a7285cde0e34ef1397e51900376a6d900d26bb5 Author: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org&gt; Date: Tue Oct 9 21:51:38 2018 +0530 fix branch chromium-freeworld.spec | 9 --------- 1 file changed, 9 deletions(-) --- diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index 9a23189..1875a50 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -144,11 +144,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld} %else Name: chromium%{chromium_channel} %endif -<<<<<<< HEAD -Version: %{majorversion}.0.3497.100 -======= Version: %{majorversion}.0.3497.100 ->>>>>>> master Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser Url: http://www.chromium.org/Home @@ -1771,11 +1767,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog * Thu Oct 4 2018 Tom Callaway <spot(a)fedoraproject.org&gt; - 69.0.3497.100-1 - update to 69.0.3497.100 - -<<<<<<< HEAD -======= - ->>>>>>> master * Wed Sep 12 2018 Tom Callaway <spot(a)fedoraproject.org&gt; - 69.0.3497.92-1 - update to 69.0.3497.92