From 12f3e5af3a686c37f4c1baa4fcd6e3a7cb475451 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: Mon, 22 Jun 2015 11:08:46 +0200
Subject: [PATCH] removed leftover line after merging

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

diff --git a/python-fasteners.spec b/python-fasteners.spec
index 1321dc8..c9b51b6 100644
--- a/python-fasteners.spec
+++ b/python-fasteners.spec
@@ -111,7 +111,6 @@ nosetests-3.4
 
 
 %changelog
-<<<<<<< HEAD
 * Mon Jun 22 2015 Matthias Runge <mrunge@redhat.com> - 0.12.0-1
 - update to 0.12.0 (rhbz#1234253)