Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 00:35:34 +03:00
Code Issues Wiki Activity

fix wrong merge

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2020-03-04 13:43:47 +01:00
parent b5c87169b3
commit 63cda19034
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/build/debug.h
View file

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