fix conflict

TheNormalnij · Oct 15, 2024 · a1cae25 · a1cae25
1 parent 9419d98
commit a1cae25
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp
@@ -101,7 +101,6 @@ void CLuaWorldDefs::LoadFunctions()
                                                                              {"setFPSLimit", SetFPSLimit},
                                                                              {"setCoronaReflectionsEnabled", ArgumentParser<SetCoronaReflectionsEnabled>},
                                                                              {"setWorldProperty", ArgumentParser<SetWorldProperty>},
-                                                                             {"setTimeFrozen", ArgumentParser<SetTimeFrozen>},
 
                                                                              // World remove/restore functions 
                                                                              {"removeWorldModel", RemoveWorldBuilding},