[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

@@ -3,7 +3,7 @@ app_usb_src = $(addprefix apps/usb/,\
usb_connected_controller.cpp \
)
app_src += $(app_usb_src)
apps_src += $(app_usb_src)
i18n_files += $(addprefix apps/usb/,\
base.de.i18n\