resolve merge conflict (again)
This commit is contained in:
parent
cd83347c72
commit
c84e8a2101
@ -392,7 +392,8 @@ function loadCards(slots, investigatorId, customizations, playerColor, commandMa
|
|||||||
deckPos,
|
deckPos,
|
||||||
Zones.getDefaultCardRotation(playerColor, zone),
|
Zones.getDefaultCardRotation(playerColor, zone),
|
||||||
true, -- Sort deck
|
true, -- Sort deck
|
||||||
Callback)
|
callback)
|
||||||
|
|
||||||
coroutine.yield(0)
|
coroutine.yield(0)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user