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/ComponentManager.h | |
| parent | f472e0ba3bf54fc5055cf9f08925bed3f98a1dbc (diff) | |
| parent | b3b762a34e7ccb4a0dcd041a693ac7180af16002 (diff) | |
merge conficts fixed
Diffstat (limited to 'src/crepe/ComponentManager.h')
| -rw-r--r-- | src/crepe/ComponentManager.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h index 38f32e4..2b5e1df 100644 --- a/src/crepe/ComponentManager.h +++ b/src/crepe/ComponentManager.h @@ -4,7 +4,6 @@ #include <memory> #include <typeindex> #include <unordered_map> -#include <utility> #include <vector> #include "Component.h" |