[BitchX/f16] updated source

[Dan Mashal]

commit 1e8f95a8273657ff748b70257235bc9f8ca46586
Author: Dan Mashal <vicodan at fedoraproject.org>
Date:   Mon May 14 18:46:53 2012 -0700

    updated source

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index da7b100..9b45604 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-e1b687f5d27cb7030abaaba70bddd032  BitchX1.2.tar.gz
-=======
 fc0fb2efe704971bc8ab58584752dcf4  BitchX1.2.tar.gz
->>>>>>> master