Merge remote-tracking branch 'upstream/main' into fix-balloons

omarcopires · Nov 6, 2024 · a2262f9 · a2262f9
2 parents 1dbde1d + 1b4de5d
commit a2262f9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/data/scripts/actions/items/mystery_box.lua b/data/scripts/actions/items/mystery_box.lua
diff --git a/src/creatures/monsters/monster.hpp b/src/creatures/monsters/monster.hpp
@@ -47,7 +47,6 @@ class Monster final : public Creature {
 	const std::string &getTypeName() const override;
 	const std::string &getNameDescription() const override;
 	void setNameDescription(std::string_view nameDescription);
-	;
 	std::string getDescription(int32_t) override;
 
 	CreatureType_t getType() const override;