[zoneminder/f28] fix merge conflicts

commit e358eefc3851609512ff8cddf3153ed81d5da8ce Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Tue Oct 2 08:04:09 2018 -0500 fix merge conflicts zoneminder.spec | 7 ------- 1 file changed, 7 deletions(-) --- diff --git a/zoneminder.spec b/zoneminder.spec index 1065c01..32f052e 100644 --- a/zoneminder.spec +++ b/zoneminder.spec @@ -25,11 +25,7 @@ %global _hardened_build 1 Name: zoneminder -<<<<<<< HEAD -Version: 1.32.0 -======= Version: 1.32.1 ->>>>>>> master Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons @@ -324,13 +320,10 @@ EOF %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder %changelog -<<<<<<< HEAD -======= * Tue Oct 2 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 1.32.1-1 - 1.32.1 release - Bug fix release ->>>>>>> master * Wed Sep 12 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 1.32.0-1 - 1.32.0 release - remove el6 (sys v init) support