[pekwm] Updated to new version

[Germán A. Racca]

commit eb0e42eeea3d80ae840bc4a6131e8ff427e7d5d6
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Fri Jan 20 16:28:05 2012 -0200

    Updated to new version

 pekwm.spec |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/pekwm.spec b/pekwm.spec
index a77801c..5e07080 100644
--- a/pekwm.spec
+++ b/pekwm.spec
@@ -1,11 +1,6 @@
 Name:		pekwm
-<<<<<<< HEAD
 Version:	0.1.14
 Release:	1%{?dist}
-=======
-Version:	0.1.13
-Release:	3%{?dist}
->>>>>>> 9d9043ac3d8183c9468833f401b6f280c6d6b6d1
 Summary:	A small and flexible window manager
 
 Group:		User Interface/Desktops
@@ -88,16 +83,8 @@ rm -rf %{buildroot}
 %{_datadir}/xsessions/%{name}.desktop
 
 %changelog
-<<<<<<< HEAD
 * Fri Jan 20 2012 Germán A. Racca <skytux at fedoraproject.org> 0.1.14-1
 - Updated to new version
-=======
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.13-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.1.13-2
-- Rebuild for new libpng
->>>>>>> 9d9043ac3d8183c9468833f401b6f280c6d6b6d1
 
 * Sun Aug 10 2011 Germán A. Racca <skytux at fedoraproject.org> 0.1.13-1
 - Updated to new version