Mesa (gallium-0.2): remove leftover merge conflict markers

Keith Whitwell keithw at kemper.freedesktop.org
Tue Sep 23 22:53:39 UTC 2008


Module: Mesa
Branch: gallium-0.2
Commit: a0bd3972b645fbe61c3d1e2bbaa1510e04bad8d8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0bd3972b645fbe61c3d1e2bbaa1510e04bad8d8

Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Tue Sep 23 15:53:19 2008 -0700

remove leftover merge conflict markers

---

 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 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 \




More information about the mesa-commit mailing list