mesa: Remove left over merge conflicts

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 0bb2dc1..86d84d4 100644 (file)
--- 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 (file)
--- 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"