From cd06b77e01aa802af3032bd994b4484de87f12d2 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 19 Jun 2017 20:54:04 -0500 Subject: [PATCH] Delete preferences_savefile.dm.rej --- code/modules/client/preferences_savefile.dm.rej | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 code/modules/client/preferences_savefile.dm.rej diff --git a/code/modules/client/preferences_savefile.dm.rej b/code/modules/client/preferences_savefile.dm.rej deleted file mode 100644 index e16f612c34..0000000000 --- a/code/modules/client/preferences_savefile.dm.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm (rejected hunks) -@@ -219,8 +219,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car - S["clientfps"] << clientfps - S["parallax"] << parallax - S["menuoptions"] << menuoptions -- S["enable_tips"] >> enable_tips -- S["tip_delay"] >> tip_delay -+ S["enable_tips"] << enable_tips -+ S["tip_delay"] << tip_delay - - return 1 -