CPunch
/
Cosmo
mirror of https://github.com/CPunch/Cosmo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lol oops

This commit is contained in:
cpunch 2023-11-03 22:59:31 -05:00
parent 7a54230cb9
commit 7f5e3ae8dc
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cbaselib.c
View File

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