[BitchX/f17] updated sources

[Dan Mashal]

commit 39da9b568405445a6ecb369b020139a045215ed3
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue May 29 21:28:52 2012 -0700

    updated sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index a3d610e..b67ec49 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-87af3f3f65706057391e86374ff1d404  BitchX1.2.tar.gz
-=======
 3b54fc2360181b8327bb8e0ef4b4debc  BitchX1.2.tar.gz
->>>>>>> master