trivial: remove stray merge conflict

diff --git a/progs/trivial/tri.c b/progs/trivial/tri.c
index c75acb3..aa45adb 100644 (file)
--- 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;