and torture my cocknballs

2020-03-15 01:50:40 -04:00
parent 7affa9956e
commit edb63ed212
1 changed files with 2 additions and 2 deletions
@@ -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