From f8f7d36294b57b5089e77b67a77964e3c2e4795a Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Fri, 4 Jun 2021 00:51:09 -0700 Subject: [PATCH] Fix conflict --- toolchains/esp-tools/riscv-isa-sim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchains/esp-tools/riscv-isa-sim b/toolchains/esp-tools/riscv-isa-sim index 2f821102..88c223fe 160000 --- a/toolchains/esp-tools/riscv-isa-sim +++ b/toolchains/esp-tools/riscv-isa-sim @@ -1 +1 @@ -Subproject commit 2f8211022e7f69aee2b41454a37a67395aa9b3e9 +Subproject commit 88c223fe7a83c11bd8a4583d24845821e86fb3d0