common tobuild,1.315,1.316

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10240

Modified Files:
	tobuild 
Log Message:
cleanup


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- tobuild	10 May 2005 02:56:37 -0000	1.315
+++ tobuild	10 May 2005 03:05:36 -0000	1.316
@@ -39,9 +39,4 @@
 ivazquez	rpms/OpenEXR/devel	OpenEXR-1_2_2-2_fc4	devel
 ivazquez	rpms/gnet2/FC-3	gnet2-2_0_7-3_fc3	fc3
 ivazquez	rpms/gnet2/devel	gnet2-2_0_7-3_fc4	devel
-<<<<<<< tobuild
-notting	rpms/jed/devel	jed-0_99_16-9	devel
-notting	rpms/jed/devel	jed-0_99_16-10	devel
-=======
->>>>>>> 1.314
 notting	rpms/jed/devel	jed-0_99_16-10	devel