resolve conflict

This commit is contained in:
jiangzhengwenjz committed 2019-06-28 01:59:40 +08:00
1 parent f52d439a85
commit c27f8d2d9e
2 files changed
-886

No files matched your search

-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.