From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 23 Sep 2008 22:53:19 +0000 (-0700)
Subject: remove leftover merge conflict markers
X-Git-Tag: 062012170305~17580^2~496^2~640
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0bd3972b645fbe61c3d1e2bbaa1510e04bad8d8;p=profile%2Fivi%2Fmesa.git

remove leftover merge conflict markers
---

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