From 5cb53d91b870396f3d30a396fa8ad305313f82c6 Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawa@users.noreply.github.com>
Date: Sat, 21 Oct 2017 22:20:09 -0500
Subject: [PATCH] Update game_options.txt

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

diff --git a/config/game_options.txt b/config/game_options.txt
index 841adf8dca..e835a4b1a6 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -85,11 +85,6 @@ PROBABILITY REVOLUTION 2
 PROBABILITY CULT 2
 PROBABILITY CHANGELING 2
 PROBABILITY WIZARD 4
-<<<<<<< HEAD
-PROBABILITY BLOB 2
-PROBABILITY RAGINMAGES 2
-=======
->>>>>>> be748e3... Disentangles blob from blob mode/removes blob mode (#31780)
 PROBABILITY MONKEY 0
 PROBABILITY METEOR 0
 PROBABILITY EXTENDED 0