From acac74a8054dbd3111d14ea0bd3b19945c50e31b Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Thu, 9 Feb 2006 12:06:49 +0000
Subject: [PATCH] Fix merge conflict

---
 xorg-x11-drivers.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xorg-x11-drivers.spec b/xorg-x11-drivers.spec
index 3d6c1c9..7ee590a 100644
--- a/xorg-x11-drivers.spec
+++ b/xorg-x11-drivers.spec
@@ -4,8 +4,6 @@ Summary: X.Org X11 driver installation package
 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