From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 11 Sep 2008 19:11:11 +0000 (+0100)
Subject: trivial: remove stray merge conflict
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fd0ee68305609b23ee135c2c547dd883014ef6fb;p=mesa.git

trivial: remove stray merge conflict
---

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;