Mesa (gallium-0.2): fix conflict breakage

[Alan Hourihane]

Module: Mesa
Branch: gallium-0.2
Commit: e8a1b31ddf39f0b09eb85653cebb9808a5daf0a9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8a1b31ddf39f0b09eb85653cebb9808a5daf0a9

Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Mon Dec  8 15:03:29 2008 +0000

fix conflict breakage

---

 progs/glsl/Makefile |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index ce82468..488a4e9 100644
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -189,9 +189,6 @@ trirast.o: trirast.c extfuncs.h shaderutil.h
 	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
 
 trirast: trirast.o shaderutil.o
-<<<<<<< HEAD:progs/glsl/Makefile
-	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
-=======
 	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
 
 
@@ -201,7 +198,6 @@ vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
 vert-tex: vert-tex.o shaderutil.o
 	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@
 
->>>>>>> origin/master:progs/glsl/Makefile