merge conflicts

This commit is contained in:
Ukendio 2024-07-07 00:18:23 +02:00
parent 68010b3b5f
commit ddbfd6c383
2 changed files with 1 additions and 4 deletions

View file

@ -7,10 +7,7 @@ local function TITLE(title: string)
print()
print(testkit.color.white(title))
end
<<<<<<< HEAD
=======
>>>>>>> b73d7e12b79401f3c52303d4ae01166b720c75b1
local jecs = require("@jecs")
local mirror = require("../mirror/init")

View file

@ -848,7 +848,7 @@ local function preparedQuery(compatibleArchetypes: { Archetype },
replace = replace
}
return it
return setmetatable(it, it) :: any
end
local function query(world: World, ...: number): Query