mesa: fix merge conflict left-overs
authorBrian Paul <brianp@vmware.com>
Tue, 6 Jan 2009 15:48:27 +0000 (08:48 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 6 Jan 2009 15:48:27 +0000 (08:48 -0700)
commitdef84fac39fe356f34d8803989b554f15dac5909
tree5bbe96c0c845b7542596317241adb3f0b5be7089
parentebcf06702c22419221c136a438c934469c2422cc
mesa: fix merge conflict left-overs
src/mesa/shader/prog_print.c