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:
parent
b5c87169b3
commit
63cda19034
1 changed files with 0 additions and 3 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue