From bfdd33e01d7d1c6de88ab30a824d6bb18297d679 Mon Sep 17 00:00:00 2001
From: CPunch <sethtstubbs@gmail.com>
Date: Sat, 26 Aug 2023 15:03:56 -0500
Subject: [PATCH] fix vm.collect()

we don't freeze the vm on entry to C functions now
---
 src/cbaselib.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cbaselib.c b/src/cbaselib.c
index 3e3e076..d653fc3 100644
--- a/src/cbaselib.c
+++ b/src/cbaselib.c
@@ -878,9 +878,14 @@ 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;
 }