[bcfg2/el6] Source file merged

[Fabian Affolter]

commit 720ef91660ef5ac3054a6f054048951b163113ff
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Jul 7 20:19:36 2012 +0200

    Source file merged

 sources |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/sources b/sources
index 193528d..32de6f2 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
-e012c36f3a9586644af776614cab8cfb  bcfg2-1.2.1.tar.gz
-766007848bc31878098e32c4d6619ae9  bcfg2-1.2.1.tar.gz.gpg
-=======
 3fc592a0dcf859083e12a2ef67d97f5d  bcfg2-1.2.3.tar.gz
 f2da61b2eeb9ced92d527e3a1195c399  bcfg2-1.2.3.tar.gz.gpg
->>>>>>> master