From 1a7a75bda3b87575e064b25c0152a5c91a287ff8 Mon Sep 17 00:00:00 2001
From: Agent X <44549182+Agent-11@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:52:33 -0500
Subject: [PATCH] Fix merge conflicts

---
 src/pc/djui/djui.c          |  2 +-
 src/pc/djui/djui_chat_box.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/pc/djui/djui.c b/src/pc/djui/djui.c
index 3206a774..3bf3c20d 100644
--- a/src/pc/djui/djui.c
+++ b/src/pc/djui/djui.c
@@ -37,7 +37,7 @@ void reset_djui(void) {
     sDjuiLuaErrorTimeout = 0;
     if (gDjuiRoot) djui_base_destroy(&gDjuiRoot->base);
 
-    if (gDjuiConsole) djui_base_destroy(&gDjuiConsole->panel->base);
+    if (gDjuiConsole) djui_base_destroy(&gDjuiConsole->base);
     extern u32 sDjuiConsoleMessages;
     sDjuiConsoleMessages = 0;
 
diff --git a/src/pc/djui/djui_chat_box.c b/src/pc/djui/djui_chat_box.c
index 04c1511b..8d96fb9b 100644
--- a/src/pc/djui/djui_chat_box.c
+++ b/src/pc/djui/djui_chat_box.c
@@ -476,16 +476,6 @@ static void djui_chat_box_input_on_text_input(struct DjuiBase *base, char* text)
     }
 }
 
-static void djui_chat_box_input_on_text_input(struct DjuiBase *base, char* text) {
-    char previousText[MAX_MSG_LENGTH];
-    strncpy(previousText, gDjuiChatBox->chatInput->buffer, MAX_MSG_LENGTH - 1);
-    djui_inputbox_on_text_input(base, text);
-    if (strcmp(previousText, gDjuiChatBox->chatInput->buffer) != 0) {
-        reset_tab_completion_all();
-    }
-}
-
-
 void djui_chat_box_toggle(void) {
     if (gDjuiChatBox == NULL) { return; }
     if (!gDjuiChatBoxFocus) { sDjuiChatBoxClearText = true; }