rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7236

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
Fix merge conflict


Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drivers.spec	9 Feb 2006 12:05:25 -0000	1.6
+++ xorg-x11-drivers.spec	9 Feb 2006 12:06:49 -0000	1.7
@@ -4,8 +4,6 @@
 Name: xorg-x11-drivers
 Version: 7.0
 Release: 1
-Version: 0.99.2
-Release: 4.1
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com