fixing merge again

src/fsfw/osal/linux/Clock.cpp

@@ -47,8 +47,8 @@ timeval Clock::getUptime() {
     return uptime;
   }
   if (ifile >> uptimeSeconds) {
-    uptime->tv_sec = uptimeSeconds;
-    uptime->tv_usec = uptimeSeconds * (double)1e6 - (uptime->tv_sec * 1e6);
+    uptime.tv_sec = uptimeSeconds;
+    uptime.tv_usec = (uptimeSeconds - uptime.tv_sec) * (double)1e6;
   }
   return uptime;
 }