fixed merge conflicts #38

Merged
Donat merged 2 commits from merge_branch into main 2025-09-26 17:02:11 +02:00

2 Commits

Author SHA1 Message Date
Donat 8980d98394 fixed merge conflicts 2025-09-26 17:01:45 +02:00
Donat 8f6634b03f fixed merge conflicts 2025-09-26 16:59:55 +02:00