[python-flask/el6] fix sources file

[Ricky Elrod]

commit 83de746696491dae73d0bded5e35930b1bf07aa1
Author: Ricky Elrod <ricky at elrod.me>
Date:   Wed Aug 8 04:57:09 2012 -0400

    fix sources file

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index d50feb3..55b4fdb 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
 4a89ef2b3ab0f151f781182bd0cc8933  Flask-0.9.tar.gz
-=======
-a5169306cfe49b3b369086f2a63816ab  Flask-0.8.tar.gz
->>>>>>> e8bf22fcda96626a3cd36e7ff44d3c8aba838e01