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 /asm/rom_8011DC0.s | |
| parent | 0c1f85f2002e911f64a3b188fa30d8f465c0fc7e (diff) | |
| parent | db898d0e4854c70a356d037919ea48aed1f62816 (diff) | |
fix record mixing merge conflicts
Diffstat (limited to 'asm/rom_8011DC0.s')
| -rw-r--r-- | asm/rom_8011DC0.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 2ba5926aa..b7f03739a 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -4,7 +4,7 @@ .syntax unified .text - + thumb_func_start nullsub_89 nullsub_89: @ 80124E8 bx lr |