From f65f816fcab163be6501b3f99d3801e6562a5bf5 Mon Sep 17 00:00:00 2001
From: Raphael <53603025+RaphDaMan@users.noreply.github.com>
Date: Tue, 23 Mar 2021 09:11:46 +0100
Subject: [PATCH] Merge issue

---
 tasmota/tasmota_template.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 8971e7482..fa937ad05 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -331,15 +331,9 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_SSD1351_DC "|"
   D_SENSOR_XPT2046_CS "|"
   D_SENSOR_CSE7761_TX "|" D_SENSOR_CSE7761_RX "|"
-<<<<<<< HEAD
   D_SENSOR_VL53L0X_XSHUT "|"
-<<<<<<< HEAD
-=======
->>>>>>> TFmini+
   D_SENSOR_TFMINIPLUS_TX "|" D_SENSOR_TFMINIPLUS_RX "|"
-=======
   D_SENSOR_MAX7219_CLK "|" D_SENSOR_MAX7219_DIN "|" D_SENSOR_MAX7219_CS "|"
->>>>>>> upstream/development
   ;
 
 const char kSensorNamesFixed[] PROGMEM =