diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/sources | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/sources b/src/mesa/main/sources index 6a165f1ae26..468121bd1dc 100644 --- a/src/mesa/main/sources +++ b/src/mesa/main/sources @@ -78,10 +78,6 @@ vsnprintf.c MESA_MAIN_HEADERS = \ accum.h \ api_arrayelt.h \ -<<<<<<< HEAD:src/mesa/main/sources -======= -api_eval.h \ ->>>>>>> master:src/mesa/main/sources api_exec.h \ api_loopback.h \ api_noop.h \ |