diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-26 07:34:38 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-26 07:34:38 +0800 |
| commit | d7cd28a98c15dd96fb0540a11f40e6be8d322fb3 (patch) | |
| tree | 412e4d93084ce9eb6d5b567a0f72d675a7c87525 /asm | |
| parent | 5c9af8295588780d90ea0b85f07696be29506761 (diff) | |
resolve conflict
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/egg_hatch.s | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s deleted file mode 100644 index 2428f2984..000000000 --- a/asm/egg_hatch.s +++ /dev/null @@ -1,8 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - .align 2, 0 @ Don't pad with nop. |