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/api/Collider.cpp | |
parent | f472e0ba3bf54fc5055cf9f08925bed3f98a1dbc (diff) | |
parent | b3b762a34e7ccb4a0dcd041a693ac7180af16002 (diff) |
merge conficts fixed
Diffstat (limited to 'src/crepe/api/Collider.cpp')
-rw-r--r-- | src/crepe/api/Collider.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/crepe/api/Collider.cpp b/src/crepe/api/Collider.cpp deleted file mode 100644 index 6370a42..0000000 --- a/src/crepe/api/Collider.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "Collider.h" - -using namespace crepe::api; - -Collider::Collider(int size) : size(size) {} |