From 4cb728f96edbb261ac16eefbd6d13e41b644c23a Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mon, 28 Sep 2015 10:32:58 -0400
Subject: [PATCH] 4.0 final

---
 python-coverage.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python-coverage.spec b/python-coverage.spec
index 0a8d1ae..ef2b650 100644
--- a/python-coverage.spec
+++ b/python-coverage.spec
@@ -118,7 +118,6 @@ popd
 
 
 %changelog
-<<<<<<< HEAD
 * Mon Sep 28 2015 Tom Callaway <spot@fedoraproject.org> - 4.0-1
 - update to 4.0 final