Resolve merge conflicts

Project-Hatchet · Dec 16, 2024 · 8fc4897 · 8fc4897
2 parents 9414bb5 + cb8ae23
commit 8fc4897
Show file tree

Hide file tree

Showing 89 changed files with 0 additions and 3,956 deletions.
diff --git a/addons/core/$PBOPREFIX$ b/addons/core/$PBOPREFIX$
diff --git a/addons/core/CfgEventHandlers.hpp b/addons/core/CfgEventHandlers.hpp
diff --git a/addons/core/CfgUI.hpp b/addons/core/CfgUI.hpp
diff --git a/addons/core/XEH_PREP.hpp b/addons/core/XEH_PREP.hpp
diff --git a/addons/core/XEH_postInit.sqf b/addons/core/XEH_postInit.sqf
diff --git a/addons/core/XEH_preInit.sqf b/addons/core/XEH_preInit.sqf
diff --git a/addons/core/XEH_preStart.sqf b/addons/core/XEH_preStart.sqf
diff --git a/addons/core/config.cpp b/addons/core/config.cpp
diff --git a/addons/core/functions/fnc_getVehicleConfig.sqf b/addons/core/functions/fnc_getVehicleConfig.sqf
diff --git a/addons/core/functions/fnc_handleVehicleChanged.sqf b/addons/core/functions/fnc_handleVehicleChanged.sqf
diff --git a/addons/core/functions/fnc_hasModule.sqf b/addons/core/functions/fnc_hasModule.sqf
diff --git a/addons/core/functions/fnc_load.sqf b/addons/core/functions/fnc_load.sqf
diff --git a/addons/core/functions/fnc_loadAll.sqf b/addons/core/functions/fnc_loadAll.sqf
diff --git a/addons/core/functions/fnc_perFrame.sqf b/addons/core/functions/fnc_perFrame.sqf