[chromium-freeworld/f29: 5/5] Merge branch 'master' into f29
commit 8f59240e82bb36edea9dd21833316ba2e288f887
Merge: 57aa56f 89cdd01
Author: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
Date: Tue Oct 9 21:44:06 2018 +0530
Merge branch 'master' into f29
.gitignore | 3 +++
chromium-freeworld.spec | 8 ++++++++
sources | 30 +++++++++++++++---------------
3 files changed, 26 insertions(+), 15 deletions(-)
---
diff --cc chromium-freeworld.spec
index c6d35f0,954b972..9a23189
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@@ -144,7 -144,7 +144,11 @@@ Name: chromium%{chromium_channel}%{?fr
%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
@@@ -1768,6 -1768,7 +1772,10 @@@ getent group chrome-remote-desktop >/de
* Thu Oct 4 2018 Tom Callaway <spot(a)fedoraproject.org> - 69.0.3497.100-1
- update to 69.0.3497.100
++<<<<<<< HEAD
++=======
+
++>>>>>>> master
* Wed Sep 12 2018 Tom Callaway <spot(a)fedoraproject.org> - 69.0.3497.92-1
- update to 69.0.3497.92