mirror of
https://github.com/Ukendio/jecs.git
synced 2025-04-25 09:30:03 +00:00
merge conflicts
This commit is contained in:
parent
68010b3b5f
commit
ddbfd6c383
2 changed files with 1 additions and 4 deletions
|
@ -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")
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue