rpms/knetstats/devel knetstats.spec,1.11,1.12

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/pkgs/rpms/knetstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31357

Modified Files:
	knetstats.spec 
Log Message:



Index: knetstats.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetstats/devel/knetstats.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- knetstats.spec	27 Feb 2008 07:43:04 -0000	1.11
+++ knetstats.spec	27 Feb 2008 07:43:48 -0000	1.12
@@ -71,18 +71,11 @@
 <<<<<<< knetstats.spec
 * Web Feb 20 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.6.1-6
 - fixed for KDE4
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.1-5
-- Autorebuild for GCC 4.3
-
-=======
-* Thu Feb 22 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.1-6
 - rebuild with kde3 compatibility packages
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.1-5
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.1-5
 - Autorebuild for GCC 4.3
 
->>>>>>> 1.10
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.6.1-4
 - mass rebuild for fedora 8 - BuildID