resolve conflicts

This commit is contained in:
UNILaptop 2024-09-25 15:31:17 +01:00
commit 022f8b6428

View file

@ -39,7 +39,7 @@ or you can find it on the society's page on the UL Wolves website
<img src="6_minecraft-onboarding/link-minecraft.png" alt="link minecraft account" width="300px" height="23px"> <img src="6_minecraft-onboarding/link-minecraft.png" alt="link minecraft account" width="300px" height="23px">
(you can use the `#bot-commands` channel to not spam everyone) (you can use the ``#bot-commands`` channel to not spam everyone)
-------------------------------------------------------------------------- --------------------------------------------------------------------------