old change

fedora/SPECS/nginx.spec

@@ -17,7 +17,7 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.17.0
+Version:           1.17.1
 Release:           1%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
@@ -530,6 +530,9 @@ fi
 [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
 
 %changelog
+* Sat Jul 13 2019 Daniel Steiner <daniel.steiner@greenmail.ch> 1.17.0-1
+- Updated to mainline version 1.17.1.
+
 * Sun Jun 16 2019 Daniel Steiner <daniel.steiner@greenmail.ch> 1.17.0-1
 - Updated to mainline version 1.17.x.
 

fedora/SPECS/polemarch.spec

@@ -15,7 +15,11 @@
 %define namebase polemarch
 %define user polemarch
 %define datad poledata
+<<<<<<< HEAD
 %define version 1.2.2
+=======
+%define version 1.3.1
+>>>>>>> ebbf0ac45fc8d9ebd3f0f316186518df44db17ce
 %define release 1
 %define __prelink_undo_cmd %{nil}
 %define _binaries_in_noarch_packages_terminate_build   0
@@ -56,9 +60,6 @@ Simply WEB gui for orchestration infrastructure by ansible playbooks.
 %prep
 %setup -q -n %name-%version
 %patch0 -b python3-patch
-#%if 0%{?fedora} > 29
-#%patch1 -b venvctrl-patch
-#%endif
 
 %install
 make BUILD_DIR=%{buildroot}
@@ -114,8 +115,13 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate
 [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
 
 %changelog
+<<<<<<< HEAD
 * Thu Jun 20 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - Update to 1.2.2 version.
+=======
+* Sat Jul 13 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- Update to 1.3.1 version.
+>>>>>>> ebbf0ac45fc8d9ebd3f0f316186518df44db17ce
 
 * Mon Jun 15 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - Update to 1.2.1 version.