merge conflicts from 05.04

This commit is contained in:
Shailen Sobhee 2026-04-05 19:08:32 +02:00
parent 3271327208
commit 08bab05343

1
.gitignore vendored
View file

@ -16,3 +16,4 @@ coredump_report.txt
coredump.bin coredump.bin
logs/ logs/
elf_archive/ elf_archive/
managed_components/