From d7cd28a98c15dd96fb0540a11f40e6be8d322fb3 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 26 Jun 2019 07:34:38 +0800 Subject: resolve conflict --- asm/egg_hatch.s | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 asm/egg_hatch.s (limited to 'asm/egg_hatch.s') 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. -- cgit v1.2.3