From ec1e378b5a1cd1900d34118023d8b62e51adf669 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Apr 13 2017 13:06:02 +0000
Subject: Fix merge conflict.


---

diff --git a/cqrlog.spec b/cqrlog.spec
index 14b879d..5bde8d3 100644
--- a/cqrlog.spec
+++ b/cqrlog.spec
@@ -103,6 +103,9 @@ fi
 - Update to latest upstream release, 2.0.5.
 - Fix icon install location, fixes BZ#1440477.
 
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Tue Jan 17 2017 Richard Shaw <hobbes1069@gmail.com> - 2.0.4-1
 - Update to latest upstream release.