trivial: remove stray merge conflict

1 files changed, 0 insertions, 3 deletions

diff --git a/progs/trivial/tri.c b/progs/trivial/tri.c
index c75acb3a5a8..aa45adb6c29 100644
--- a/progs/trivial/tri.c
+++ b/progs/trivial/tri.c
@@ -60,10 +60,7 @@ static void Key(unsigned char key, int x, int y)
 
     switch (key) {
       case 27:
-<<<<<<< HEAD:progs/trivial/tri.c
          glutDestroyWindow(win);
-=======
->>>>>>> gallium-0.1:progs/trivial/tri.c
 	exit(0);
       default:
 	return;