diff options
author | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
commit | 2c14d6ee6c40f4b7e5cd9366080ce911d67be718 (patch) | |
tree | 4a70ca275a2f161d2d23f63d0608f92d8ea08acb /src/rtc.c | |
parent | d6a88e0eaa7d74f187fb27f8a376203f40537340 (diff) | |
parent | d9a5de5317d4589b139f9532a7e8bf3b851e673f (diff) |
fix merge conflicts
Diffstat (limited to 'src/rtc.c')
-rw-r--r-- | src/rtc.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -344,4 +344,3 @@ u16 RtcGetLocalDayCount(void) { return RtcGetDayCount(&sRtc); } - |