[pekwm: 2/2] Updated to new version

[Germán A. Racca]

commit ab888e52e051804232279a4fdf7344ce919feaa4
Merge: 1ed95a5 9d9043a
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Fri Jan 20 16:24:38 2012 -0200

    Updated to new version

 pekwm.spec |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)
---
diff --cc pekwm.spec
index 5e07080,3666f9f..a77801c
--- a/pekwm.spec
+++ b/pekwm.spec
@@@ -1,6 -1,6 +1,11 @@@
  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
@@@ -83,8 -83,11 +88,16 @@@ 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