Fix merge conflict

This commit is contained in:
mharris 2006-02-09 12:06:49 +00:00
parent a1d80c687e
commit acac74a805

View File

@ -4,8 +4,6 @@ Summary: X.Org X11 driver installation package
Name: xorg-x11-drivers Name: xorg-x11-drivers
Version: 7.0 Version: 7.0
Release: 1 Release: 1
Version: 0.99.2
Release: 4.1
License: MIT/X11 License: MIT/X11
Group: User Interface/X Hardware Support Group: User Interface/X Hardware Support
URL: http://www.redhat.com URL: http://www.redhat.com