From 2874786ae622c0ddc568a195783957f152d33f94 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Fri, 6 Jan 2012 00:56:37 +0000 Subject: [PATCH] [Fix] I knew Git would leave the conflict headers in there like a bitch! --- src/libUnuk/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/libUnuk/Makefile b/src/libUnuk/Makefile index 2a12948..02887e2 100644 --- a/src/libUnuk/Makefile +++ b/src/libUnuk/Makefile @@ -5,10 +5,7 @@ objects = ApplySurface.o Button.o ButtonToggle.o Character.o Collision.o \ Debug.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \ Map.o MapElement.o MapEntities.o NPC.o ParticleEmitter.o \ Rect.o Text.o Texture.o TextureManager.o Timer.o \ -<<<<<<< HEAD -======= AStar.o \ ->>>>>>> playground .PHONY: default all clean