1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 16:25:26 +03:00

fix wrong merge

This commit is contained in:
Pawel Spychalski (DzikuVx) 2020-03-04 13:43:47 +01:00
parent b5c87169b3
commit 63cda19034

View file

@ -67,11 +67,8 @@ typedef enum {
DEBUG_ERPM,
DEBUG_RPM_FILTER,
DEBUG_RPM_FREQ,
<<<<<<< HEAD
DEBUG_NAV_YAW,
=======
DEBUG_DYNAMIC_FILTER,
DEBUG_DYNAMIC_FILTER_FREQUENCY,
>>>>>>> development
DEBUG_COUNT
} debugType_e;