[xl2tpd/f16] missed merge failure in sources file

[Paul Wouters]

commit 36ed4e19c6bec52ad9e6b049395b478f1ed7f5e8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Apr 20 11:29:59 2012 -0400

    missed merge failure in sources file

 sources |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/sources b/sources
index e39574c..568bb82 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
-<<<<<<< HEAD
-8748ac5e2f5289963d9a908eede546b5  xl2tpd-1.2.8.tar.gz
-28264284552c442b24cf421755a2bb48  xl2tpd-1.3.0.tar.gz
-=======
->>>>>>> 23c5a05... * Tue Feb 28 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-3
 cf61576fef5c2d6c68279a408ec1f0d5  xl2tpd-1.3.1.tar.gz