chore: resolve merge conflict

4 years ago · 8df9f4d8a3
parent 5d9da0b611
commit 8df9f4d8a3
1 changed files with 1 additions and 1 deletions
--- 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