From edb63ed212285f11f1ab53ec1e1ac128ee7752be Mon Sep 17 00:00:00 2001
From: ZeroMan <cookiesvvww@gmail.com>
Date: Sun, 15 Mar 2020 01:50:40 -0400
Subject: [PATCH] and torture my cocknballs

---
 _maps/map_files/BoxStation/BoxStation.dmm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 204ab3f353..bc82cb3fa0 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -261,7 +261,7 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aaK" = (
-<<<<<<< HEAD/obj/machinery/computer/arcade/battle{
+/obj/machinery/computer/arcade/battle{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -91723,7 +91723,7 @@ aYo
 aZV
 bao
 baP
-aaK
+aat
 bcP
 cBo
 bgS