Mesa (gallium-0.2): mesa: Remove left over merge conflicts

[Jakob Bornecrantz]

Module: Mesa
Branch: gallium-0.2
Commit: c9122c0c0308345e2df2448bcb189d0f5d505909
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9122c0c0308345e2df2448bcb189d0f5d505909

Author: Jakob Bornecrantz <jakob at tungstengraphics.com>
Date:   Mon Sep 22 12:47:57 2008 +0200

mesa: Remove left over merge conflicts

---

 src/glx/x11/Makefile          |    4 ----
 src/mesa/x86/common_x86_asm.S |    3 ---
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 0bb2dc1..86d84d4 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -51,10 +51,6 @@ INCLUDES = -I. \
 	-I$(TOP)/include \
 	-I$(TOP)/include/GL/internal \
 	-I$(TOP)/src/mesa \
-<<<<<<< HEAD:src/glx/x11/Makefile
-	-I$(TOP)/src/mesa/main \
-=======
->>>>>>> master:src/glx/x11/Makefile
 	-I$(TOP)/src/mesa/glapi \
 	$(LIBDRM_CFLAGS) \
 	$(DRI2PROTO_CFLAGS) \
diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index a681ff9..ea4047a 100644
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -39,10 +39,7 @@
  * in there will break the build on some platforms.
  */
 
-<<<<<<< HEAD:src/mesa/x86/common_x86_asm.S
-=======
 #include "matypes.h"
->>>>>>> master:src/mesa/x86/common_x86_asm.S
 #include "assyntax.h"
 #include "common_x86_features.h"