From f07945ec4e434a4d5521bd42f29b8310fb9a6a1e Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 9 Jul 2020 20:08:00 -0400
Subject: [PATCH] Update ripley.dm

---
 code/game/mecha/working/ripley.dm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index 74ed830f1a5..47336a4d48d 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -81,8 +81,7 @@
 		qdel (B)
 
 
-<<<<<<< HEAD
-// VORESTATION EDIT BEGIN
+//Vorestation Edit Start
 
 /obj/mecha/working/ripley/New()
 	..()
@@ -96,9 +95,8 @@
 
 	orescanner.attack_self(usr)
 
-// VORESTATION EDIT END
+//Vorestation Edit End
 
-=======
 //Meant for random spawns.
 /obj/mecha/working/ripley/mining/old
 	desc = "An old, dusty mining ripley."
@@ -108,4 +106,3 @@
 	health = 25
 	maxhealth = 190	//Just slightly worse.
 	cell.charge = rand(0, cell.charge)
->>>>>>> 5d10e60... Add a random mech spawner (Not mapped in yet) (#7324)