Fix merge conflicts

2019-01-02 21:25:14 +00:00
parent 1e3da62d24 a0ff38d0be
commit a3ebca4d81
773 changed files with 11252 additions and 23425 deletions
--- a/src/link.c
+++ b/src/link.c
@@ -1080,7 +1080,7 @@ bool8 sub_800A4D8(u8 a0)
    return FALSE;
 }

-bool8 sub_800A520(void)
+bool8 IsLinkTaskFinished(void)
 {
    if (gWirelessCommType == TRUE)
    {