From c9122c0c0308345e2df2448bcb189d0f5d505909 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Mon, 22 Sep 2008 12:47:57 +0200 Subject: mesa: Remove left over merge conflicts --- src/mesa/x86/common_x86_asm.S | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S index a681ff9b9e..ea4047a0e1 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" -- cgit v1.2.3