mesa: fix merge conflict left-overs

diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 8a50fe76fe671b7f0b81c11b9e88299132b49d3f..db6eac4fd9844468ac33d204f791f42d4902df7a 100644 (file)
--- 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)
 {