From 7b3ad3dfe531632d8c5ef44d937ebdfaa85f8f45 Mon Sep 17 00:00:00 2001
From: mverch67 <manuel.verch@gmx.de>
Date: Sat, 31 Aug 2024 14:30:44 +0200
Subject: [PATCH] fix merge

---
 src/main.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index e91a5ae17..052a76101 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -278,7 +278,6 @@ void setup()
     unphone.printStore();
 #endif
 
-=======
 #if ARCH_PORTDUINO
     struct timeval tv;
     tv.tv_sec = time(NULL);