From 41ad584cdf370563edc5b62a1db82713d77080d8 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Mon, 27 Sep 2021 14:02:26 -0400
Subject: [PATCH] Fix merge

---
 code/modules/random_map/automata/caves.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/random_map/automata/caves.dm b/code/modules/random_map/automata/caves.dm
index e60cf453344..9783c77541b 100644
--- a/code/modules/random_map/automata/caves.dm
+++ b/code/modules/random_map/automata/caves.dm
@@ -69,9 +69,5 @@
 			else if(map[current_cell] == EMPTY_CHAR)
 				T.make_ore(1)
 		get_additional_spawns(map[current_cell],T,get_spawn_dir(x, y))
-<<<<<<< HEAD
 	//VOREStation Edit End
 	return T
-=======
-	return T
->>>>>>> f8718ae0bcf... Merge pull request #8299 from MistakeNot4892/automata