From fb2df0e57095913254fc154c29ad323f3f959970 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Thu, 14 Jul 2022 02:32:35 -0500
Subject: [PATCH] [Hotfix] Fix merge issue

---
 zone/gm_commands/logs.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/zone/gm_commands/logs.cpp b/zone/gm_commands/logs.cpp
index a4d24df78..b0e32a35f 100755
--- a/zone/gm_commands/logs.cpp
+++ b/zone/gm_commands/logs.cpp
@@ -139,19 +139,19 @@ void command_logs(Client *c, const Seperator *sep)
 				);
 			}
 
-			std::string gmsay_string = JoinString(gmsay, "-");
-			std::string console_string = JoinString(console, "-");
-			std::string file_string = JoinString(file, "-");
-			std::string discord_string = JoinString(discord, "-");
+			std::string gmsay_string = Strings::Join(gmsay, "-");
+			std::string console_string = Strings::Join(console, "-");
+			std::string file_string = Strings::Join(file, "-");
+			std::string discord_string = Strings::Join(discord, "-");
 
 			c->Message(
 				0,
 				fmt::format(
 					"G [{}] C [{}] F [{}] D [{}] [{}] [{}] ",
-					rtrim(gmsay_string, "-"),
-					rtrim(console_string, "-"),
-					rtrim(file_string, "-"),
-					rtrim(discord_string, "-"),
+					Strings::RTrim(gmsay_string, "-"),
+					Strings::RTrim(console_string, "-"),
+					Strings::RTrim(file_string, "-"),
+					Strings::RTrim(discord_string, "-"),
 					index,
 					Logs::LogCategoryName[index]
 				).c_str()