diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/x86/common_x86_asm.S | 3 |
1 files changed, 0 insertions, 3 deletions
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" |