packages: libkexiv2/libkexiv2.spec - fix mismerge in changelog

[sparky]

Author: sparky                       Date: Sun Dec 13 20:45:29 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix mismerge in changelog

---- Files affected:
packages/libkexiv2:
   libkexiv2.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/libkexiv2/libkexiv2.spec
diff -u packages/libkexiv2/libkexiv2.spec:1.15 packages/libkexiv2/libkexiv2.spec:1.16
--- packages/libkexiv2/libkexiv2.spec:1.15	Tue Nov 11 13:07:49 2008
+++ packages/libkexiv2/libkexiv2.spec	Sun Dec 13 21:45:24 2009
@@ -81,20 +81,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2009/12/13 20:45:24  sparky
+- fix mismerge in changelog
+
 Revision 1.15  2008/11/11 12:07:49  arekm
 - release 5
 
 Revision 1.14  2008/06/28 10:11:06  arekm
 - release 4
 
-<<<<<<< libkexiv2.spec
-Revision 1.12  2008-04-23 16:41:30  arekm
-=======
 Revision 1.13  2008/06/24 18:27:25  draenog
 - missing BR: pkg-config
 
 Revision 1.12  2008/04/23 16:41:30  arekm
->>>>>>> 1.13
 - rel 2
 
 Revision 1.11  2008-04-22 15:32:42  shadzik
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libkexiv2/libkexiv2.spec?r1=1.15&r2=1.16&f=u