Fixed merge conflicts

This commit is contained in:
EivindH06
2025-10-06 15:03:25 +02:00
2 changed files with 23 additions and 2 deletions

View File

@@ -165,4 +165,4 @@ lib_ldf_mode = off
lib_compat_mode = off
lib_deps = ${esp32.lib_deps}
lib_ignore = ${common.lib_ignore}
extra_scripts = ${common.extra_scripts}
extra_scripts = ${common.extra_scripts}