summaryrefslogtreecommitdiff
path: root/src/mesa/main/sources
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-09-23 15:53:19 -0700
committerKeith Whitwell <keith@tungstengraphics.com>2008-09-23 15:53:19 -0700
commita0bd3972b645fbe61c3d1e2bbaa1510e04bad8d8 (patch)
tree51c325ed3bba56b77a342e8ccf2a80e68e77077f /src/mesa/main/sources
parent1c79cf15c48e51cb5cf790f44214ae6aaf78c69b (diff)
remove leftover merge conflict markers
Diffstat (limited to 'src/mesa/main/sources')
-rw-r--r--src/mesa/main/sources4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index 6a165f1ae2..468121bd1d 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 \