From 851c862ddf468825706654b6044ef5998a8b7402 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 14 Nov 2017 13:08:07 -0600 Subject: [PATCH] Update game_options.txt --- config/game_options.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config/game_options.txt b/config/game_options.txt index 7794fb9376..5e36e25808 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -504,7 +504,6 @@ MICE_ROUNDSTART 10 ## If the percentage of players alive (doesn't count conversions) drops below this threshold the emergency shuttle will be forcefully called (provided it can be) #EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2 -<<<<<<< HEAD ## CREW OBJECTIVES ## ## Comment to disable objectives for innocent crew members. ALLOW_CREW_OBJECTIVES @@ -515,7 +514,6 @@ ALLOW_MISCREANTS ## Uncomment to let miscreants spawn during Extended. I hold no responsibility for fun that may occur while this is enabled. #ALLOW_EXTENDED_MISCREANTS -======= + ## Determines if players are allowed to print integrated circuits, uncomment to allow. #IC_PRINTING ->>>>>>> bdfbafd... [READY]integrated circuitry port+upgrade. (#32481)