From: Brian Paul <brianp@vmware.com>
Date: Tue, 6 Jan 2009 15:48:27 +0000 (-0700)
Subject: mesa: fix merge conflict left-overs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=def84fac39fe356f34d8803989b554f15dac5909;p=mesa.git

mesa: fix merge conflict left-overs
---

diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 8a50fe76fe6..db6eac4fd98 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -358,7 +358,6 @@ _mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended)
 }
 
 
-<<<<<<< HEAD:src/mesa/shader/prog_print.c
 void
 _mesa_print_swizzle(GLuint swizzle)
 {