diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/shader/prog_print.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c index 8a50fe76fe..db6eac4fd9 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) { |