Update dance_machine.dm

code/game/machinery/dance_machine.dm

@@ -81,12 +81,8 @@
 	else
 		icon_state = "[initial(icon_state)]"
 
-<<<<<<< HEAD
-/obj/machinery/disco/interact(mob/user)
-=======
 /obj/machinery/jukebox/ui_interact(mob/user)
 	. = ..()
->>>>>>> 4471461... Refactors Dance Machine + deletes a bunch of sound files (#36815)
 	if (!anchored)
 		to_chat(user,"<span class='warning'>This device must be anchored by a wrench!</span>")
 		return
@@ -96,14 +92,10 @@
 		return
 	if(!Adjacent(user) && !isAI(user))
 		return
-<<<<<<< HEAD
-	user.set_machine(src)
-=======
 	if(!songs.len)
 		to_chat(user,"<span class='warning'>Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.</span>")
 		playsound(src,'sound/misc/compiler-failure.ogg', 25, 1)
 		return
->>>>>>> 4471461... Refactors Dance Machine + deletes a bunch of sound files (#36815)
 	var/list/dat = list()
 	dat +="<div class='statusDisplay' style='text-align:center'>"
 	dat += "<b><A href='?src=[REF(src)];action=toggle'>[!active ? "BREAK IT DOWN" : "SHUT IT DOWN"]<b></A><br>"