From 93d25859b252e50d8cdc59a233a21bafa04da332 Mon Sep 17 00:00:00 2001
From: Dmitry Vagner <typecat@Dmitrys-MacBook-Pro.local>
Date: Mon, 8 Aug 2022 10:51:01 -0400
Subject: [PATCH] merge

---
 evm/src/cpu/kernel/asm/basic_macros.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evm/src/cpu/kernel/asm/basic_macros.asm b/evm/src/cpu/kernel/asm/basic_macros.asm
index f265c69f..9583409c 100644
--- a/evm/src/cpu/kernel/asm/basic_macros.asm
+++ b/evm/src/cpu/kernel/asm/basic_macros.asm
@@ -203,4 +203,4 @@
     // stack: 0xffffffff, x
     and
     // stack: 0xffffffff & x
-%endmacro
\ No newline at end of file
+%endmacro