Update game_options.txt

2017-10-21 22:20:09 -05:00
parent c0ddbacd29
commit 5cb53d91b8
1 changed files with 0 additions and 5 deletions
@@ -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