From 99df2d825e4099feec1a1877ba8f6230b6f868a6 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Jul 24 2017 16:06:52 +0000
Subject: Fix conflicts.


---

diff --git a/flmsg.spec b/flmsg.spec
index 0d918d9..86e2e90 100644
--- a/flmsg.spec
+++ b/flmsg.spec
@@ -5,7 +5,7 @@ Version:        4.0.3
 %if 0%{?prerel}
 Release:        1%{?dist}
 %else
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 Summary:        Fast Light Message Amateur Radio Forms Manager
 
@@ -65,6 +65,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 * Mon Jul 24 2017 Richard Shaw <hobbes1069@gmail.com> - 4.0.3-1
 - Update to latest upstream release.
 
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Tue Nov 15 2016 Richard Shaw <hobbes1069@gmail.com> - 4.0.0-1
 - Update to latest upstream release.