chore: resolve merge conflicts

This commit is contained in:
2026-08-01 14:08:02 +02:00
parent ae0d514ffb
commit 138cbf8c6a
+5 -1
View File
@@ -16,4 +16,8 @@ All assets are located in subfolders for their asset type in `src/`. Assets type
- Audio (`audio`)
- Icons (`icons`)
There are also some special `src/` subfolders like those for legal content.
There are also some special `src/` subfolders like those for legal content.
## Setup
Please execute the setup script in `scripts/` for your platform when cloning the repository.