From 7f5e3ae8dcf7b6f717af75b62d69a9729935b1ea Mon Sep 17 00:00:00 2001 From: cpunch Date: Fri, 3 Nov 2023 22:59:31 -0500 Subject: [PATCH] lol oops --- src/cbaselib.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/cbaselib.c b/src/cbaselib.c index b9737ce..524810c 100644 --- a/src/cbaselib.c +++ b/src/cbaselib.c @@ -1032,14 +1032,8 @@ int cosmoB_vnewindexBProto(CState *state, int nargs, CValue *args) // vm.collect() int cosmoB_vcollect(CState *state, int nargs, CValue *args) { -<<<<<<< HEAD - // now force a garbage collection - cosmoM_collectGarbage(state); - -======= // force a garbage collection cosmoM_collectGarbage(state); ->>>>>>> 409937c (fix vm.collect()) return 0; }