2022-04-19 18:45:52 -04:00
1 changed files with 5 additions and 0 deletions
--- a/test3.lua
+++ b/test3.lua
@ -52,5 +52,10 @@ multi:benchMark(sleep_for,multi.Priority_Core,"Core:"):OnBench(bench)
 multi.OnExit(function()
 	print("Total: ".. a)
 end)
+<<<<<<< HEAD
 multi:mainloop{print=true,priority=3}
+=======
+multi:mainloop()
+
+>>>>>>> f1f6e30a9833625630b84f8e6bfff179807b0102
 --multi:lightloop()