mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-08-20 09:57:09 +00:00
trying to resolve conflict
This commit is contained in:
parent
5755be1faf
commit
44f17c7e7c
|
|
@ -62,6 +62,6 @@ GameType *GameModeCommand::getModeForString(shared_ptr<CommandSender> source, co
|
|||
}
|
||||
else
|
||||
{
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue