From f58c06daeef76c77046b07f6cb150814416208fe Mon Sep 17 00:00:00 2001
From: Marcus <dad401@gmx.de>
Date: Wed, 3 Nov 2021 18:51:59 +0100
Subject: [PATCH] fixes

---
 tasmota/tasmota_template.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 1b1325156..737788a13 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -394,19 +394,12 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_BL0939_RX "|"
   D_SENSOR_BL0942_RX "|"
   D_SENSOR_HM330X_SET "|"
-<<<<<<< HEAD
   D_SENSOR_HEARTBEAT "|" D_SENSOR_HEARTBEAT "_i|"
-<<<<<<< HEAD
   D_GPIO_SHIFT595_SRCLK "|" D_GPIO_SHIFT595_RCLK "|" D_GPIO_SHIFT595_OE "|" D_GPIO_SHIFT595_SER "|"
   D_SENSOR_SOLAXX1_RTS "|"
   D_SENSOR_OPTION " E|"
-;
-=======
-=======
   D_SENSOR_SDM230_TX "|" D_SENSOR_SDM230_RX
->>>>>>> 	changed:       BUILDS.md
-  ;
->>>>>>> 	changed:       BUILDS.md
+;
 
 const char kSensorNamesFixed[] PROGMEM =
   D_SENSOR_USER;