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

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

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

Modified Files:
	knetstats.spec 
Log Message:



Index: knetstats.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetstats/devel/knetstats.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- knetstats.spec	27 Feb 2008 07:43:48 -0000	1.12
+++ knetstats.spec	27 Feb 2008 07:44:44 -0000	1.13
@@ -68,7 +68,6 @@
 %{_docdir}/HTML/en/%{name}/
 
 %Changelog
-<<<<<<< knetstats.spec
 * Web Feb 20 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.6.1-6
 - fixed for KDE4
 - rebuild with kde3 compatibility packages