diff options
| author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 20:59:34 +0200 |
|---|---|---|
| committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 20:59:34 +0200 |
| commit | 15a4c4a1cf67e13be53ef423c51c56488f332ea9 (patch) | |
| tree | 661084fc8171089ce32bf779f2b3a85d634b38e4 /src/crepe/ScriptSystem.cpp | |
| parent | f472e0ba3bf54fc5055cf9f08925bed3f98a1dbc (diff) | |
| parent | b3b762a34e7ccb4a0dcd041a693ac7180af16002 (diff) | |
merge conficts fixed
Diffstat (limited to 'src/crepe/ScriptSystem.cpp')
| -rw-r--r-- | src/crepe/ScriptSystem.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp index 5d882be..d00d474 100644 --- a/src/crepe/ScriptSystem.cpp +++ b/src/crepe/ScriptSystem.cpp @@ -2,12 +2,13 @@ #include <functional> #include <vector> -#include "ComponentManager.h" -#include "ScriptSystem.h" #include "api/BehaviorScript.h" #include "api/Script.h" #include "util/log.h" +#include "ComponentManager.h" +#include "ScriptSystem.h" + using namespace std; using namespace crepe; using namespace crepe::api; |