From 8df9f4d8a3fd80f06d38cae50362d507f5878ebf Mon Sep 17 00:00:00 2001
From: Sean McBride <spmcbride1201@gmail.com>
Date: Thu, 4 Mar 2021 10:38:17 -0500
Subject: [PATCH] chore: resolve merge conflict

---
 Makefile.wasm.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.wasm.inc b/Makefile.wasm.inc
index 6d70adc..2b467a0 100644
--- a/Makefile.wasm.inc
+++ b/Makefile.wasm.inc
@@ -15,7 +15,7 @@ MEMC_MPX=mpx.c
 MEMC_SEG=segmented.c
 
 # for silverfish
-RT_DIR=${BASE_DIR}/runtime/
+RT_DIR=${BASE_DIR}/awsm/runtime/
 RT_MEM=${RT_DIR}/memory/
 RT_LIBC=${RT_DIR}/libc/libc_backing.c
 RT_RT=${RT_DIR}/runtime.c