fix merge

This commit is contained in:
mverch67 2024-08-31 14:30:44 +02:00
parent b125fc4fc9
commit 7b3ad3dfe5

View File

@ -278,7 +278,6 @@ void setup()
unphone.printStore();
#endif
=======
#if ARCH_PORTDUINO
struct timeval tv;
tv.tv_sec = time(NULL);