mirror of
https://github.com/meshtastic/firmware.git
synced 2025-02-26 22:33:24 +00:00
fix merge
This commit is contained in:
parent
b125fc4fc9
commit
7b3ad3dfe5
@ -278,7 +278,6 @@ void setup()
|
||||
unphone.printStore();
|
||||
#endif
|
||||
|
||||
=======
|
||||
#if ARCH_PORTDUINO
|
||||
struct timeval tv;
|
||||
tv.tv_sec = time(NULL);
|
||||
|
Loading…
Reference in New Issue
Block a user