rpms/kernel/devel kernel.spec,1.1354,1.1355

[Mauro Carvalho Chehab]

Author: mchehab

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3728

Modified Files:
	kernel.spec 
Log Message:
Remove some trash that were added by mistake on the latest changeset




Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1354
retrieving revision 1.1355
diff -u -r1.1354 -r1.1355
--- kernel.spec	28 Feb 2009 03:08:27 -0000	1.1354
+++ kernel.spec	28 Feb 2009 03:13:38 -0000	1.1355
@@ -1849,7 +1849,6 @@
 * Wed Feb 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.158.rc6.git2
 - re-add modules.modesetting list.
 
->>>>>>> 1.1353
 * Wed Feb 25 2009 Jeremy Katz <katzj at redhat.com> 2.6.29-0.157.rc6.git2
 - add dcbw's patch to fix wireless problems on the OLPC (from cjb, should
    be upstream "soon" but is currently blocking OLPC testing)