remove leftover merge conflict markers

diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 6a165f1..468121b 100644 (file)
--- 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 \