From 76ed57f90c0a465642288f234b06dd367c71bc1f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 02:11:11 -0500 Subject: [PATCH] rej cleanup --- code/__HELPERS/type2type.dm.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 code/__HELPERS/type2type.dm.rej diff --git a/code/__HELPERS/type2type.dm.rej b/code/__HELPERS/type2type.dm.rej deleted file mode 100644 index dcbecaa236..0000000000 --- a/code/__HELPERS/type2type.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm (rejected hunks) -@@ -72,7 +72,7 @@ - return . - - //Splits the text of a file at seperator and returns them in a list. --/proc/file2list(filename, seperator="\n") -+/world/proc/file2list(filename, seperator="\n") - return splittext(return_file_text(filename),seperator) - -