1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-12 19:10:32 +03:00

Merged conflict resolution

This commit is contained in:
blckmn 2025-06-22 16:12:03 +10:00
parent e274bc21ce
commit 0ad8fa23a5

View file

@ -196,7 +196,6 @@ SPEED_OPTIMISED_SRC += \
SIZE_OPTIMISED_SRC += \ SIZE_OPTIMISED_SRC += \
drivers/bus_i2c_timing.c \ drivers/bus_i2c_timing.c \
STM32/bus_i2c_hal_init.c \ STM32/bus_i2c_hal_init.c \
STM32/serial_usb_vcp.c \
drivers/serial_escserial.c drivers/serial_escserial.c
DSP_LIB := $(LIB_MAIN_DIR)/CMSIS/DSP DSP_LIB := $(LIB_MAIN_DIR)/CMSIS/DSP