From 68a49b60c6cc2a2f010ed377e52213c444001a3e Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <newman446@hotmail.com>
Date: Fri, 18 Jun 2021 13:55:01 -0700
Subject: [PATCH] Funny HEAD/MASTER conflict resolved

---
 maps/tether/tether-03-surface3.dmm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 59a2e184319..b2d0e604d75 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -36805,11 +36805,7 @@
 	cell_type = /obj/item/weapon/cell/super;
 	dir = 8;
 	name = "west bump";
-<<<<<<< HEAD
-	nightshift_setting = 0;
-=======
 	nightshift_setting = 2;
->>>>>>> origin/master
 	pixel_x = -30
 	},
 /obj/structure/cable/green{