From: Adam Powers Date: Mon, 19 Oct 2020 18:45:22 +0000 (-0700) Subject: fix stash merge conflict X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fcc02fb813f4e5289a40d2746fef4a6b491d12b;p=nethack fix stash merge conflict --- diff --git a/sys/libnh/libnhmain.c b/sys/libnh/libnhmain.c index fe5ea55e7..2a11d4d25 100644 --- a/sys/libnh/libnhmain.c +++ b/sys/libnh/libnhmain.c @@ -1071,7 +1071,6 @@ void create_global (char *name, void *ptr, char *type); void js_globals_init() { // int i; // char buf[BUFSZ]; - printf("js_globals_init\n"); EM_ASM({ globalThis.nethackGlobal = globalThis.nethackGlobal || {};