mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-25 17:25:20 +03:00
rebase correction
This commit is contained in:
parent
6e37b352e7
commit
4899c0898d
1 changed files with 0 additions and 1 deletions
|
@ -83,7 +83,6 @@ int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; // interval [1000;2000]
|
|||
rxRuntimeConfig_t rxRuntimeConfig;
|
||||
static rxConfig_t *rxConfig;
|
||||
|
||||
<<<<<<< HEAD
|
||||
static uint16_t nullReadRawRC(rxRuntimeConfig_t *rxRuntimeConfig, uint8_t channel) {
|
||||
UNUSED(rxRuntimeConfig);
|
||||
UNUSED(channel);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue