archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-02 07:25:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a botched merge conflict attempt

Browse source 
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.
This commit is contained in:
Mike Swanson 2014-01-20 06:30:26 -08:00
parent 29695eb7ca
commit 4c4ad3ac37
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
graphics/text/Makefile
View file

@ -57,4 +57,3 @@ graphics.stamp: config.py fontchars ../../lumps/fraggle/freedoom.bex
clean: clean:
rm -f $(GRAPHICS) graphics.stamp *.pyc rm -f $(GRAPHICS) graphics.stamp *.pyc
rm -f $(GRAPHICS) *.pyc