From def84fac39fe356f34d8803989b554f15dac5909 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 6 Jan 2009 08:48:27 -0700
Subject: [PATCH] mesa: fix merge conflict left-overs

---
 src/mesa/shader/prog_print.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 8a50fe7..db6eac4 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)
 {
-- 
2.7.4