From f520d5abf99e4b8b1a7f1150e93289f2337e933f Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 22 Jun 2022 21:59:47 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/controllers/subsystems/media_tracks.dm | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/code/controllers/subsystems/media_tracks.dm b/code/controllers/subsystems/media_tracks.dm
index c1408de08e..534de10704 100644
--- a/code/controllers/subsystems/media_tracks.dm
+++ b/code/controllers/subsystems/media_tracks.dm
@@ -126,21 +126,12 @@ SUBSYSTEM_DEF(media_tracks)
 			report_progress("New media track added by [C]: [T.title]")
 		sort_tracks()
 		return
-<<<<<<< HEAD
-
-	var/title = input(C, "REQUIRED: Provide title for track", "Track Title") as text|null
-	if(!title)
-		return
-
-	var/duration = input(C, "REQUIRED: Provide duration for track (in deciseconds, aka seconds*10)", "Track Duration") as num|null
-=======
 	
 	var/title = tgui_input_text(C, "REQUIRED: Provide title for track", "Track Title")
 	if(!title)
 		return
 	
 	var/duration = tgui_input_number(C, "REQUIRED: Provide duration for track (in deciseconds, aka seconds*10)", "Track Duration")
->>>>>>> b875945450... Merge pull request #13112 from ItsSelis/tgui-input-conversions
 	if(!duration)
 		return
 
@@ -148,13 +139,8 @@ SUBSYSTEM_DEF(media_tracks)
 	var/artist = tgui_input_text(C, "Optional: Provide artist for track", "Track Artist")
 	if(isnull(artist)) // Cancel rather than empty string
 		return
-<<<<<<< HEAD
-
-	var/genre = input(C, "Optional: Provide genre for track (try to match an existing one)", "Track Genre") as text|null
-=======
 	
 	var/genre = tgui_input_text(C, "Optional: Provide genre for track (try to match an existing one)", "Track Genre")
->>>>>>> b875945450... Merge pull request #13112 from ItsSelis/tgui-input-conversions
 	if(isnull(genre)) // Cancel rather than empty string
 		return