diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-28 01:59:40 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-28 01:59:40 +0800 |
| commit | c27f8d2d9ee63deaf9de9f7c3689e072400ab5c3 (patch) | |
| tree | 762017142a35fce1efbf37714c94b318c6a91dce /asm | |
| parent | f52d439a8588f82268ed199ce08ce3c792071ff3 (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. |