From e4311c5d0bcfff70254a518b8e8dd619a4b4e1e7 Mon Sep 17 00:00:00 2001 From: Luke Benstead Date: Tue, 5 Jun 2018 19:52:01 +0100 Subject: [PATCH] Update Makefile --- samples/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/samples/Makefile b/samples/Makefile index c3bdd7c..ca3c239 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -12,8 +12,5 @@ all: $(KOS_MAKE) -C nehe03 all $(KOS_MAKE) -C nehe06 all $(KOS_MAKE) -C ortho2d all -<<<<<<< HEAD $(KOS_MAKE) -C lerabot01 all -======= $(KOS_MAKE) -C zclip all ->>>>>>> 5b05039dfd461861a8541aa66ea325f59bb9f746