[libmnl/el5] fix sources when mergeing.

[Hushan Jia]

commit ece79e4eb559172508362ae853c1b6d387fc4e98
Author: Hushan Jia <hushan.jia at gmail.com>
Date:   Mon Jun 11 22:05:37 2012 +0800

    fix sources when mergeing.

 sources |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/sources b/sources
index 5d6ec18..28211b1 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
-<<<<<<< HEAD
-e936236bb57a2375afa4e70e75dc3ba9  libmnl-1.0.1.tar.bz2
-370d02d10bdf2e987c29385eca2d758b  libmnl-1.0.2.tar.bz2
-=======
 7d95fc3bea3365bc03c48e484224f65f  libmnl-1.0.3.tar.bz2
->>>>>>> master