From fc567c2f4ad9b3c02205dc1a3342c6c2b192673e Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Tue, 26 May 2020 17:54:18 +0200
Subject: [PATCH] Update set.h

---
 set.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/set.h b/set.h
index 01e9cca9..7cb62348 100644
--- a/set.h
+++ b/set.h
@@ -1,4 +1,10 @@
+<<<<<<< Updated upstream
 //===============FIRMWARE SETTINGS=====================================
+=======
+/*******************************************************************
+ **********************FIRMWARE SETTINGS****************************
+ ******************************************************************/
+>>>>>>> Stashed changes
 String firmware_version = "2.3.3";
 boolean mb_4_of_memory = true;
 //#define OTA_enable