rebase correction

2015-09-02 00:41:12 +02:00 · 2015-09-02 00:41:12 +02:00 · 4899c0898d
parent 6e37b352e7
commit 4899c0898d
1 changed files with 0 additions and 1 deletions
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@ -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);