Merge branch 'master' into mueller/FixedTimeslotUpdate

2020-09-22 16:20:07 +02:00
parent 8f2c8c838e 59e4b95b62
commit d0f912f32b
2 changed files with 3 additions and 1 deletions
@@ -6,8 +6,8 @@
 #include <linux/sysinfo.h>
 #include <time.h>
 #include <unistd.h>
+#include <fstream>

-//#include <fstream>
 uint16_t Clock::leapSeconds = 0;
 MutexIF* Clock::timeMutex = NULL;