diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/rtc.c | |
parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) |
fixing 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); } - |