Removing merging-issues

4 years ago · ae93f60d2c
1 changed files with 0 additions and 3 deletions
--- a/src/settings.h
+++ b/src/settings.h
@ -218,7 +218,6 @@
            constexpr const char topicBatteryVoltage[] PROGMEM = "State/ESPuino/Voltage";
        #endif
    #endif
-<<<<<<< HEAD

    // !!! MAKE SURE TO EDIT PLATFORM SPECIFIC settings-****.h !!!
    #if (HAL == 1)
@ -237,6 +236,4 @@
        #include "settings-custom.h"                        // Contains all user-relevant settings custom-board
    #endif

-=======
->>>>>>> 15a06350b94ca27ba7d88401436a90da2c068d50
 #endif