From 4c4ad3ac3705c608c5a7874c998b1d00f5e07859 Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Mon, 20 Jan 2014 06:30:26 -0800 Subject: [PATCH] Fix a botched merge conflict attempt While harmless, my previous commit resolving a merge accidentally resulted in Fabian's line being preserved at the end when it shouldn't have been. --- graphics/text/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/graphics/text/Makefile b/graphics/text/Makefile index fe136e51..8352c17b 100644 --- a/graphics/text/Makefile +++ b/graphics/text/Makefile @@ -57,4 +57,3 @@ graphics.stamp: config.py fontchars ../../lumps/fraggle/freedoom.bex clean: rm -f $(GRAPHICS) graphics.stamp *.pyc - rm -f $(GRAPHICS) *.pyc