From 87fbc0183cac4d0b6fb9881fca84e70f538dbc33 Mon Sep 17 00:00:00 2001
From: Colby Austin Brown <colbyaustinbrown@gmail.com>
Date: Thu, 2 Jan 2025 14:04:17 -0800
Subject: [PATCH] Remove extraneous line

---
 include/m_string_data.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/m_string_data.h b/include/m_string_data.h
index 049bf28c..9796886e 100644
--- a/include/m_string_data.h
+++ b/include/m_string_data.h
@@ -21,8 +21,6 @@ extern "C" {
 #define mString_CARPETPEDDLER_START 0x48a
 #define mString_TOTAKEKE_START 0x1b93
 
->>>>>>> 69b951b (Implement & link ac_npc_totakeke.c)
-
 #ifdef __cplusplus
 }
 #endif