[python-txamqp/el6: 2/3] Fix sources merge issue

[Silas Sewell]

commit 4c89ce298d9ecf90fca3d09a048598c70e7146cf
Author: Silas Sewell <silas at sewell.org>
Date:   Thu Dec 27 20:38:25 2012 -0500

    Fix sources merge issue

 sources |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 0234996..171ba9f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,2 @@
 984aa9c7195549c12a0aaae92b6fe503  python-txamqp_0.3.orig.tar.gz
-<<<<<<< HEAD
-=======
 c082f994d00fca5f3664c80827bf2622  txAMQP-0.6.1.tar.gz
->>>>>>> f17