rpms/kdevelop/devel kdevelop.spec,1.35,1.36

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17367

Modified Files:
	kdevelop.spec 
Log Message:
typo



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kdevelop.spec	11 Aug 2005 13:37:22 -0000	1.35
+++ kdevelop.spec	11 Aug 2005 13:38:22 -0000	1.36
@@ -167,7 +167,6 @@
 * Thu Jul 07 2005 Than Ngo <than at redhat.com> 8:3.2.1-3
 - fix uninitialized variable warning #162367
 
->>>>>>> 1.34
 * Thu Jun 30 2005 Than Ngo <than at redhat.com> 9:3.2.1-2
 - apply patch to fix undefined symbol issue #162146