diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
| commit | e44f35c7b7fb49a55073c5b40257a4b8052cd5a0 (patch) | |
| tree | ad35f76e058386824229a64290a1ef15a9f120c2 /include/strings.h | |
| parent | 0c1f85f2002e911f64a3b188fa30d8f465c0fc7e (diff) | |
| parent | db898d0e4854c70a356d037919ea48aed1f62816 (diff) | |
fix record mixing merge conflicts
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/strings.h b/include/strings.h index f9b752176..a86ab25fe 100644 --- a/include/strings.h +++ b/include/strings.h @@ -110,6 +110,8 @@ extern const u8 gText_MoveCloserToLinkPartner[]; extern const u8 gText_CommErrorCheckConnections[]; extern const u8 gText_ABtnTitleScreen[]; extern const u8 gText_ABtnRegistrationCounter[]; +extern const u8 gText_MixingRecords[]; +extern const u8 gText_RecordMixingComplete[]; extern const u8 gText_EmptyString2[]; extern const u8 gText_Confirm3[]; extern const u8 gText_Cancel4[]; |