From 44f17c7e7ce2f824a6a7bb283f48654e08af7735 Mon Sep 17 00:00:00 2001
From: KKNecmi <oyunoyunpro343434@gmail.com>
Date: Mon, 9 Mar 2026 05:53:28 +0300
Subject: [PATCH] trying to resolve conflict

---
 Minecraft.World/GameModeCommand.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Minecraft.World/GameModeCommand.cpp b/Minecraft.World/GameModeCommand.cpp
index 8a1be50ab..5c50c5ef6 100644
--- a/Minecraft.World/GameModeCommand.cpp
+++ b/Minecraft.World/GameModeCommand.cpp
@@ -62,6 +62,6 @@ GameType *GameModeCommand::getModeForString(shared_ptr<CommandSender> source, co
 	}
 	else
 	{
-        return NULL;
+        return nullptr;
 	}
 }
\ No newline at end of file