From 972deeae2db2aa9ba542533aa121059d8d32d003 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 15 Mar 2020 14:42:57 -0400
Subject: [PATCH] Update announce.dm

---
 code/defines/procs/announce.dm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index ba2555e7f3..c68acc43a4 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -113,10 +113,5 @@ datum/announcement/proc/Log(message as text, message_title as text)
 			rank = character.mind.role_alt_title
 		AnnounceArrivalSimple(character.real_name, rank, join_message)
 
-<<<<<<< HEAD
-/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive at the station shortly") //VOREStation Edit - Remove shuttle reference
-=======
-
-/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive to the station shortly by shuttle", new_sound = 'sound/misc/notice3.ogg')
->>>>>>> 22e28f2... Merge pull request #6804 from Cerebulon/bigsounds
+/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive at the station shortly", new_sound = 'sound/misc/notice3.ogg') //VOREStation Edit - Remove shuttle reference
 	global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer")