diff options
| author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-09-22 12:47:57 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-09-22 12:47:57 +0200 |
| commit | c9122c0c0308345e2df2448bcb189d0f5d505909 (patch) | |
| tree | c60ef3c141cf22334b61d2adbdab6309c2ec9d13 /src/mesa/x86 | |
| parent | dace236c5fffa29d59e4d12fa865889bbecbdd24 (diff) | |
mesa: Remove left over merge conflicts
Diffstat (limited to 'src/mesa/x86')
| -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 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" |