From b185b979062d4be4138beea8f9aad1ccbda87adb Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 2 Mar 2018 21:33:57 -0500
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 8695ba47b2..c085e882f1 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -488,7 +488,6 @@ MICE_ROUNDSTART 10
 ## Determines if players are allowed to print integrated circuits, uncomment to allow.
 #IC_PRINTING
 
-<<<<<<< HEAD
 ## CITADEL Races
 ROUNDSTART_RACES mammal
 ROUNDSTART_RACES avian
@@ -511,10 +510,9 @@ ALLOW_MISCREANTS
 
 ## Determines if players are allowed to print integrated circuits, uncomment to allow.
 #IC_PRINTING
-=======
+
 ## Uncomment to allow roundstart trait selection in the character setup menu.
 ROUNDSTART_TRAITS
->>>>>>> ab9e2e8... Adds minor roundstart traits! (ala CDDA, etc.) (#35440)
 
 ## Enable night shifts ##
 ENABLE_NIGHT_SHIFTS