From 0c1f12dc5c77977b34789a805372198174eebcea Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Thu, 10 May 2018 23:48:28 -0400
Subject: [PATCH] Update game_options.txt

---
 config/game_options.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/game_options.txt b/config/game_options.txt
index 32ae01c973..6ecec1fc9e 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -512,7 +512,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
@@ -537,11 +536,8 @@ 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.
-=======
 ## Uncomment to allow roundstart quirk selection in the character setup menu.
 ## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait!
->>>>>>> 821a9ad... Merge pull request #37646 from Xhuis/conflicts_imminent
 ROUNDSTART_TRAITS
 
 ## Uncomment to disable human moods.