Merging with develop

This commit is contained in:
Zoe Roux
2021-06-17 14:50:41 +02:00
8 changed files with 121 additions and 63 deletions
@@ -14,7 +14,7 @@ using namespace std::chrono_literals;
namespace BBM
{
class BombHolderComponent : public WAL::Component
class BombHolderComponent : public WAL::Component
{
public:
//! @brief The number of bomb that this entity hold.