Resolve messy rebase

README.md

@@ -51,11 +51,7 @@ For more information please refer to the [ESPurna Wiki](https://bitbucket.org/xo
 |![IteadStudio Sonoff Dual](images/devices/sonoff-dual.jpg) **IteadStudio Sonoff Dual**|![IteadStudio Sonoff POW](images/devices/sonoff-pow.jpg) **IteadStudio Sonoff POW**|![IteadStudio Sonoff TH10/TH16](images/devices/sonoff-th10-th16.jpg) **IteadStudio Sonoff TH10/TH16**|
 |![IteadStudio Sonoff RF](images/devices/sonoff-rf.jpg) **IteadStudio Sonoff RF**|![IteadStudio Sonoff SV](images/devices/sonoff-sv.jpg) **IteadStudio Sonoff SV**|![IteadStudio Sonoff Touch](images/devices/sonoff-touch.jpg) **IteadStudio Sonoff Touch**|
 |![Wemos D1 Mini Relay Shield](images/devices/d1mini.jpg) **Wemos D1 Mini Relay Shield**|![Electrodragon Relay Board](images/devices/electrodragon-relay-board.jpg) **Electrodragon Relay Board**|![WorkChoice EcoPlug](images/devices/workchoice-ecoplug.jpg) **WorkChoice EcoPlug**|
-<<<<<<< HEAD
-|![JanGoe Wifi Relay (NO/NC)](images/devices/jangoe-wifi-relay.png) **JanGoe Wifi Relay (NO/NC)**|||
-=======
-|![WiFi MQTT Relay / Thermostat](images/devices/wifi-relay.jpg) **WiFi MQTT Relay / Thermostat**|
->>>>>>> Add support for WiFi MQTT Relay / Thermostat from OpenEnergyMonitor here; https://guide.openenergymonitor.org/integrations/mqtt-relay/
+|![JanGoe Wifi Relay (NO/NC)](images/devices/jangoe-wifi-relay.png) **JanGoe Wifi Relay (NO/NC)**|![WiFi MQTT Relay / Thermostat](images/devices/mqtt-relay.jpg) **WiFi MQTT Relay / Thermostat**||
 
 
 ## License

code/espurna/config/arduino.h

@@ -28,6 +28,7 @@
 //#define WIFI_RELAY_NC
 //#define WIFI_RELAY_NO
 //#define ESPURNA
+//#define MQTT_RELAY
 
 //--------------------------------------------------------------------------------
 // Features (values below are non-default values)

code/platformio.ini

@@ -264,7 +264,6 @@ upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
 
-<<<<<<< HEAD
 [env:jangoe-debug]
 platform = espressif8266
 framework = arduino
@@ -282,25 +281,27 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 extra_script = pio_hooks.py
 build_flags = -g -DDEBUG_PORT=Serial -DWIFI_RELAY_NC
-=======
-[env:wifi-relay-debug]
+upload_speed = 115200
+upload_port = "192.168.4.1"
+upload_flags = --auth=fibonacci --port 8266
+
+[env:mqtt-relay-debug]
 platform = espressif8266
 framework = arduino
 board = esp_wroom_02
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 extra_script = pio_hooks.py
-build_flags = -g -DDEBUG_PORT=Serial -DDEBUG_FAUXMO=Serial -DNOWSAUTH -DWIFI_RELAY -DENABLE_DS18B20=1
+build_flags = -g -DDEBUG_PORT=Serial -DDEBUG_FAUXMO=Serial -DNOWSAUTH -DMQTT_RELAY -DENABLE_DS18B20=1
 
-[env:wifi-relay-debug-ota]
+[env:mqtt-relay-debug-ota]
 platform = espressif8266
 framework = arduino
 board = esp_wroom_02
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 extra_script = pio_hooks.py
-build_flags = -g -DDEBUG_PORT=Serial -DDEBUG_FAUXMO=Serial -DNOWSAUTH -DWIFI_RELAY -DENABLE_DS18B20=1
->>>>>>> Add support for WiFi MQTT Relay / Thermostat from OpenEnergyMonitor here; https://guide.openenergymonitor.org/integrations/mqtt-relay/
+build_flags = -g -DDEBUG_PORT=Serial -DDEBUG_FAUXMO=Serial -DNOWSAUTH -DMQTT_RELAY -DENABLE_DS18B20=1
 upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266