From 511f450addb8d7cc12f89a7663b79bcc9320d993 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Tue, 14 Mar 2023 12:08:00 -0700 Subject: [PATCH] resolved conflicts --- evm/src/cpu/kernel/asm/bignum/add.asm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/evm/src/cpu/kernel/asm/bignum/add.asm b/evm/src/cpu/kernel/asm/bignum/add.asm index 7d4eda24..09b405e8 100644 --- a/evm/src/cpu/kernel/asm/bignum/add.asm +++ b/evm/src/cpu/kernel/asm/bignum/add.asm @@ -11,11 +11,7 @@ global add_bignum: %jumpi(len_zero) // stack: len, a_start_loc, b_start_loc, retdest PUSH 0 -<<<<<<< HEAD // stack: carry=0, i=len, a_cur_loc=a_start_loc, b_cur_loc=b_start_loc, retdest -======= - // stack: carry=0, i=len, a_start_loc, b_start_loc, retdest ->>>>>>> 96ddadf6 (basic bignum) add_loop: // stack: carry, i, a_cur_loc, b_cur_loc, retdest DUP4