chore: resolve merge conflicts

This commit is contained in:
2026-08-01 13:44:52 +02:00
parent b7c90ab189
commit 15855b2728
+4
View File
@@ -13,3 +13,7 @@ All assets are located in subfolders for their asset type in `src/`. Assets type
- Icons (`icons`)
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.