diff options
Diffstat (limited to 'constants/type_constants.asm')
| -rwxr-xr-x | constants/type_constants.asm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 095a3d28..66085f8d 100755 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -13,8 +13,4 @@ GRASS EQU $16 ELECTRIC EQU $17 PSYCHIC EQU $18 ICE EQU $19 -<<<<<<< HEAD -DRAGON EQU $1A -======= -DRAGON EQU $1A ->>>>>>> d48ea223eaad84af95e4f29043c279b56aa4ae88 +DRAGON EQU $1A
\ No newline at end of file |