[gwsmhg: 4/4] merge some mess

[Mads Kiilerich]

commit a10260da2a38f6d2a72a33138456a6fc057d2bb6
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Mon Jun 27 21:55:45 2011 +0200

    merge some mess

 gwsmhg.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/gwsmhg.spec b/gwsmhg.spec
index 4cffa37..d125547 100644
--- a/gwsmhg.spec
+++ b/gwsmhg.spec
@@ -53,16 +53,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< HEAD
 * Mon Jun 27 2011 Mads Kiilerich <mads at kiilerich.com> - 0.13-1
 - gwsmhg-0.13
 
-* Tue Feb 22 2011 Mads Kiilerich <mads at kiilerich.com> - 0.12-1
-- gwsmhg-0.12
-=======
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
->>>>>>> 2d22268743c9d21ce8eba76a2cd6053c24c62295
 
 * Wed Dec 08 2010 Mads Kiilerich <mads at kiilerich.com> - 0.12-1
 - gwsmhg-0.12