From fd0ee68305609b23ee135c2c547dd883014ef6fb Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 11 Sep 2008 20:11:11 +0100 Subject: trivial: remove stray merge conflict --- progs/trivial/tri.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'progs/trivial') diff --git a/progs/trivial/tri.c b/progs/trivial/tri.c index c75acb3a5a..aa45adb6c2 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; -- cgit v1.2.3