diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
| commit | 93f767e26de82d1d4133e719a758578ede98b306 (patch) | |
| tree | 0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /include/text.h | |
| parent | dd7e19107879f74d8f962a6a47d619470eaefbcd (diff) | |
| parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) | |
resolve conflict
Diffstat (limited to 'include/text.h')
| -rw-r--r-- | include/text.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/text.h b/include/text.h index cf413644b..e9e8eb8c2 100644 --- a/include/text.h +++ b/include/text.h @@ -9,8 +9,9 @@ #define CHAR_ELLIPSIS 0xB0 #define CHAR_MALE 0xB5 #define CHAR_FEMALE 0xB6 -#define CHAR_COMMA 0xB8 #define CHAR_CURRENCY 0xB7 +#define CHAR_COMMA 0xB8 +#define CHAR_MULT_SIGN 0xB9 #define CHAR_SLASH 0xBA #define CHAR_A 0xBB #define CHAR_B 0xBC |