From ad87abca0a7099377650dff418d064a590ee9778 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Thu, 7 Feb 2013 15:46:42 +0000
Subject: [PATCH] flakes

---
 kombu/tests/test_pools.py | 1 +
 pavement.py               | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/kombu/tests/test_pools.py b/kombu/tests/test_pools.py
index 1ec34395..5bdde622 100644
--- a/kombu/tests/test_pools.py
+++ b/kombu/tests/test_pools.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import with_statement
 
 from kombu import Connection, Producer
diff --git a/pavement.py b/pavement.py
index 57f8ce97..476c6cc3 100644
--- a/pavement.py
+++ b/pavement.py
@@ -91,15 +91,9 @@ def readme(options):
 ])
 def bump(options):
     s = "-- '%s'" % (options.custom, ) \
-<<<<<<< HEAD
             if getattr(options, 'custom', None) else ''
     sh('extra/release/bump_version.py \
             kombu/__init__.py README.rst %s' % (s, ))
-=======
-        if getattr(options, "custom", None) else ""
-    sh("extra/release/bump_version.py \
-            kombu/__init__.py README.rst %s" % (s, ))
->>>>>>> 2.5
 
 
 @task