From 74cb8f19a196ec43be2d0091bbe84c737b2c419a Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 1 May 2020 14:22:45 -0400
Subject: [PATCH] Update tracer.dm

---
 .../temporary_visuals/projectiles/tracer.dm        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
index 36cef4e4c42..4326bc536d6 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
@@ -115,7 +115,12 @@
 	light_power = 3
 	light_color = "#3300ff"
 
-<<<<<<< HEAD
+/obj/effect/projectile/tracer/cannon
+	icon_state = "cannon"
+	light_range = 1
+	light_power = 0.5
+	light_color = "#f6f2b6"
+
 //VOREStation edit: medigun
 /obj/effect/projectile/tracer/medigun
 	icon = 'icons/obj/projectiles_vr.dmi'
@@ -124,10 +129,3 @@
 	light_power = 0.5
 	light_color = "#80F5FF"
 //VOREStation edit ends
-=======
-/obj/effect/projectile/tracer/cannon
-	icon_state = "cannon"
-	light_range = 1
-	light_power = 0.5
-	light_color = "#f6f2b6"
->>>>>>> aafd4b4... Explorer Expansion: New Horizons (#6960)