From 7fe93d6ea051179f0855da0ee99c1a98e2dd18f8 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: Jan 08 2014 11:50:04 +0000
Subject: fix build issue


---

diff --git a/python-kombu.spec b/python-kombu.spec
index 114ba5b..c0f6b29 100644
--- a/python-kombu.spec
+++ b/python-kombu.spec
@@ -89,8 +89,6 @@ This subpackage is for python3
 %prep
 %setup -q -n %{srcname}-%{version}
 
-# manage requirements on rpm base
-sed -i 's/>=1.0.13,<1.1.0/>=1.3.0/' requirements/default.txt
 
 %if 0%{?with_python3}
 cp -a . %{py3dir}
@@ -167,7 +165,6 @@ popd
 
 * Mon Oct 14 2013 Matthias Runge <mrunge@redhat.com> - 2.5.15-1
 - updated to 2.5.15 (rhbz#1016271)
->>>>>>> f20
 
 * Sun Aug 25 2013 Fabian Affolter <mail@fabian-affolter.ch> - 2.5.14-1
 - Updated to latest upstream version 2.5.14 (rhbz#1000696)