rpms/kernel/devel kernel.spec,1.401,1.402

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel.spec 
Log Message:
remove stray cvs conflict marker



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- kernel.spec	4 Feb 2008 22:43:25 -0000	1.401
+++ kernel.spec	5 Feb 2008 00:44:04 -0000	1.402
@@ -1804,7 +1804,6 @@
 - iwlwifi: remove ieee80211 types from iwl-helpers.h
 - mac80211: dissolve pre-rx handlers
 
->>>>>>> 1.400
 * Fri Feb 01 2008 Chuck Ebbert <cebbert at redhat.com>
 - Fix build with GCC 4.3, part 2.