From 4cea1feb1b991e33753042aef5343f2605205d9a Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Tue, 10 Apr 2018 03:16:28 -0400
Subject: [PATCH] Update vr_sleeper.dm

---
 code/modules/VR/vr_sleeper.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm
index 4bcf46a9f0..20054069da 100644
--- a/code/modules/VR/vr_sleeper.dm
+++ b/code/modules/VR/vr_sleeper.dm
@@ -185,14 +185,11 @@
 /obj/effect/landmark/vr_spawn //places you can spawn in VR, auto selected by the vr_sleeper during get_vr_spawnpoint()
 	var/vr_category = "default" //So we can have specific sleepers, eg: "Basketball VR Sleeper", etc.
 
-<<<<<<< HEAD
-=======
 /obj/effect/landmark/vr_spawn/team_1
 	vr_category = "team_1"
 
 /obj/effect/landmark/vr_spawn/team_2
 	vr_category = "team_2"	
->>>>>>> 469a216... Minor VR sleeper related changes (#36974)
 
 /datum/outfit/vr_basic
 	name = "basic vr"