fix vm.collect()

we don't freeze the vm on entry to C functions now

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;
 }