From a9791361615950a2317c5f9f5176cd412439ee94 Mon Sep 17 00:00:00 2001
From: Javier Arigita <arigita@gmail.com>
Date: Sat, 18 Apr 2020 20:51:03 +0200
Subject: [PATCH] Fix kCommandSource adding heating source

---
 tasmota/xdrv_39_heating.ino | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tasmota/xdrv_39_heating.ino b/tasmota/xdrv_39_heating.ino
index a62fd4065..78c315712 100644
--- a/tasmota/xdrv_39_heating.ino
+++ b/tasmota/xdrv_39_heating.ino
@@ -55,11 +55,7 @@ typedef union {
     uint16_t status_output : 1;       // Status of the output switch
     uint16_t status_cycle_active : 1; // Status showing if cycle is active (Output ON) or not (Output OFF)
     uint16_t state_emergency : 1;     // State for heating emergency
-<<<<<<< HEAD
-    uint16_t counter_seconds : 6;     // Second counter
-=======
     uint16_t counter_seconds : 6;     // Second counter used to track minutes
->>>>>>> new_branch_dev
   };
 } HeatingBitfield;