rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.110,1.111

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19385

Modified Files:
	glibc-kernheaders.spec 
Log Message:
Remove stray cvs conflict marker


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- glibc-kernheaders.spec	27 Apr 2006 01:39:06 -0000	1.110
+++ glibc-kernheaders.spec	27 Apr 2006 01:49:37 -0000	1.111
@@ -119,7 +119,6 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
->>>>>>> 1.106
 * Mon Feb 6 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-5
 - Add EOWNERDEAD and ENOTRECOVERABLE error codes