mesa: Remove left over merge conflicts

2008-09-22 12:47:57 +02:00
parent dace236c5f
commit c9122c0c03
2 changed files with 0 additions and 7 deletions
@@ -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) \
@@ -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"