[Fix] Fix conflicts ._.

This commit is contained in:
Quentin
2020-04-07 14:53:19 +02:00
194 changed files with 4774 additions and 1958 deletions

View File

@@ -7,7 +7,7 @@ app_on_boarding_src = $(addprefix apps/on_boarding/,\
power_on_self_test.cpp \
)
app_src += $(app_on_boarding_src)
apps_src += $(app_on_boarding_src)
i18n_files += $(addprefix apps/on_boarding/,\
base.de.i18n\