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

---
 code/game/gamemodes/events/holidays/Holidays.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm
index b9d11d7227..c04d6408b6 100644
--- a/code/game/gamemodes/events/holidays/Holidays.dm
+++ b/code/game/gamemodes/events/holidays/Holidays.dm
@@ -214,13 +214,8 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 
 	Holiday = list()
 
-<<<<<<< HEAD
-	var/H = input(src,"What holiday is it today?","Set Holiday") as text
-	var/B = input(src,"Now explain what the holiday is about","Set Holiday") as message
-=======
 	var/H = tgui_input_text(src,"What holiday is it today?","Set Holiday")
 	var/B = tgui_input_text(src,"Now explain what the holiday is about","Set Holiday", multiline = TRUE, prevent_enter = TRUE)
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
 
 
 	Holiday[H] = B