From 08bab053437f514ca74e5638177c75c71448599c Mon Sep 17 00:00:00 2001 From: Shailen Sobhee Date: Sun, 5 Apr 2026 19:08:32 +0200 Subject: [PATCH] merge conflicts from 05.04 --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d384d46..8568304 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ build/ coredump_report.txt coredump.bin logs/ -elf_archive/ \ No newline at end of file +elf_archive/ +managed_components/