trivial: remove stray merge conflict
authorKeith Whitwell <keith@tungstengraphics.com>
Thu, 11 Sep 2008 19:11:11 +0000 (20:11 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Thu, 11 Sep 2008 19:11:11 +0000 (20:11 +0100)
commitfd0ee68305609b23ee135c2c547dd883014ef6fb
tree7e426dc13c4ec2783d5b393b5d248a918b3be02e
parentb66ee9e32fa044b39588df67c00858bbab64f13d
trivial: remove stray merge conflict
progs/trivial/tri.c