[libcomps/f19] - cripled spec after merge fixed

[Jindrich Luza]

commit b91d1abc9b6cc09e955c9f3d5150cbf095d3e327
Author: Jindrich Luza <jluza at redhat.com>
Date:   Wed Aug 14 12:21:19 2013 +0200

    - cripled spec after merge fixed

 libcomps.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/libcomps.spec b/libcomps.spec
index c1c4785..aca5a28 100644
--- a/libcomps.spec
+++ b/libcomps.spec
@@ -116,13 +116,8 @@ rm -rf $buildroot
 
 
 %changelog
-<<<<<<< HEAD
-* Thu Aug 08 2013 Jindrich Luza <jluza at redhat.com> 0.1.2.git2574596
-- spec modified
-=======
 * Wed Aug 14 2013 Jindrich Luza <jluza at redhat.com> 0.1.2.git4951a3e
 - __test.py print removed
->>>>>>> master
 
 * Thu Jul 18 2013 Jindrich Luza <jluza at redhat.com> 0.1.2
 - automatic changelog system