From 8152b0d92e6ab596cdb9764bc51e304381b7646d Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 2 May 2018 14:44:32 -0500 Subject: Bad git penny: MTR gets the WiFi/GNSS pins from the gpio_pins structure --- io-module/mts-io.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/io-module/mts-io.c b/io-module/mts-io.c index 0318c97..31f69f9 100644 --- a/io-module/mts-io.c +++ b/io-module/mts-io.c @@ -46,15 +46,7 @@ #include #include "mts_io.h" -<<<<<<< dc450195b63fd13ff74154e5ca06fabec58afd11:io-module/mts-io.c #include "buttons.h" -======= - -#define DRIVER_VERSION "v1.5.15" -#define DRIVER_AUTHOR "James Maki " -#define DRIVER_DESC "MTS-IO Controller" -#define DRIVER_NAME "mts-io" ->>>>>>> Bump the level:io-module/mts_io.c #define PLATFORM_NAME "mts-io" -- cgit v1.2.3