From 46b52f8ba0f6862e3245f6fd4daadc1adb29c40f Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 6 Aug 2015 10:34:23 -0500
Subject: [PATCH] remove errant MERGING fragment

---
 qt5-qtbase.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 8f6ade8..10f6960 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -928,7 +928,6 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
 * Thu Aug 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-13
 - use upstream commit/fix for QTBUG-46310
 - restore qdoc/gdb hackery, i686 still needs it :(