From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Mon, 22 Sep 2008 10:47:57 +0000 (+0200)
Subject: mesa: Remove left over merge conflicts
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c9122c0c0308345e2df2448bcb189d0f5d505909;p=mesa.git

mesa: Remove left over merge conflicts
---

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 0bb2dc10d14..86d84d4b9ff 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 a681ff9b9eb..ea4047a0e14 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"