From 4dcfa357a75fc8a090ba89a835cf6f60a0d22539 Mon Sep 17 00:00:00 2001
From: Adrian <atablante04@gmail.com>
Date: Sat, 17 Aug 2024 13:53:39 -0400
Subject: [PATCH] UPDATE menu-ui-handler.ts

---
 src/ui/menu-ui-handler.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index 134eee59c4b..1a9b076a9cb 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -143,10 +143,6 @@ export default class MenuUiHandler extends MessageUiHandler {
     menuMessageText.setName("menu-message");
     menuMessageText.setOrigin(0, 0);
     menuMessageText.setWordWrapWidth(menuMessageBox.getBounds().width - this.menuBg.width * 0.04);
-<<<<<<< HEAD
-    menuMessageText.setData("originalFont", menuMessageText.style.fontSize);
-=======
->>>>>>> 84bb19a8de2 (Refactor and create adjustText function)
 
     this.menuMessageBoxContainer.add(menuMessageText);
     this.message = menuMessageText;