[opendnssec/f18] sources oops

[Paul Wouters]

commit 051af74503472263d9058a91876ff5893957cb8d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Jan 20 18:50:33 2013 -0500

    sources oops

 sources |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/sources b/sources
index 72d057c..b2f5549 100644
--- a/sources
+++ b/sources
@@ -1,7 +1 @@
-<<<<<<< HEAD
-c7e00424dbbf87ccf4667f3b397b0aa1  opendnssec-1.4.0a1.tar.gz
-52c7fc307a0db647e2f74adb939b75cb  opendnssec-1.4.0a2.tar.gz
-c5951e833a9414e3cbe575e7c66ee3ee  opendnssec-1.4.0b1.tar.gz
-=======
 bfd92b2830e1723acc90f20e575cf8cb  opendnssec-1.4.0rc1.tar.gz
->>>>>>> ebc1d51... Updated to 1.4.0rc1