Fix merge conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/src/rtc.c b/src/rtc.c
index 3f413d0e3..37a06fe7e 100644
--- a/src/rtc.c
+++ b/src/rtc.c
@@ -340,7 +340,7 @@ u32 RtcGetMinuteCount(void)
     return (24 * 60) * RtcGetDayCount(&sRtc) + 60 * sRtc.hour + sRtc.minute;
 }
 
-u16 RtcGetLocalDayCount(void)
+u32 RtcGetLocalDayCount(void)
 {
     return RtcGetDayCount(&sRtc);
 }