- cripled spec after merge fixed

2013-08-14 12:35:19 +02:00 · 2013-08-14 12:35:19 +02:00 · 752c61c508
commit 752c61c508
parent 0e57505955
1 changed files with 0 additions and 9 deletions
--- a/libcomps.spec
+++ b/libcomps.spec
@ -1,8 +1,4 @@
-<<<<<<< HEAD
-%global commit 257459634117baa067c3dde2a8ea83def6851094
-=======
 %global commit 4951a3ec8b8e9a210471c4d42be370a310cc78ab
->>>>>>> master

 Name:           libcomps
 Version:        0.1.2
@ -120,13 +116,8 @@ rm -rf $buildroot


 %changelog
-<<<<<<< HEAD
-* Thu Aug 08 2013 Jindrich Luza <jluza@redhat.com> 0.1.2.git2574596
- spec modified
-=======
 * Wed Aug 14 2013 Jindrich Luza <jluza@redhat.com> 0.1.2.git4951a3e
 - __test.py print removed
->>>>>>> master

 * Thu Jul 18 2013 Jindrich Luza <jluza@redhat.com> 0.1.2
 - automatic changelog system