From e93660928499f963d477720b628a05e8d14ea197 Mon Sep 17 00:00:00 2001
From: Jordan Crouse <jordan.crouse@amd.com>
Date: Fri, 14 Mar 2008 16:38:21 -0600
Subject: amd: Missed a merge artifact - kick me in the head for breaking
 tinderbox

---
 src/gx_driver.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gx_driver.c b/src/gx_driver.c
index 8f0106d..66aa31c 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -539,7 +539,6 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
 
     if (xf86ReturnOptValBool(GeodeOptions, GX_OPTION_NOACCEL, FALSE))
 	pGeode->NoAccel = TRUE;
->>>>>>> patched
 
     pGeode->rotation = RR_Rotate_0;
 
-- 
cgit v1.2.3