fix PR merge conflicts

This commit is contained in:
Evan committed 2019-11-21 09:31:40 -07:00
commit 407d22af8e
47 files changed
+1979 -4704

No files matched your search

+1 -1
View File
@@ -4517,7 +4517,7 @@ gUnknown_841E2F5:: @ 841E2F5
gUnknown_841E322:: @ 841E322
.string "{ID}$"
gUnknown_841E325:: @ 841E325
gText_CommunicationStandby5:: @ 841E325
.string "Communication standby…$"
gDaycareText_GetAlongVeryWell:: @ 841E33C