resolve merge conflict (again)

2022-12-06 11:34:00 +01:00 · 2022-12-06 11:34:00 +01:00 · c84e8a2101
commit c84e8a2101
parent cd83347c72
1 changed files with 2 additions and 1 deletions
--- a/src/arkhamdb/DeckImporterMain.ttslua
+++ b/src/arkhamdb/DeckImporterMain.ttslua
@ -392,7 +392,8 @@ function loadCards(slots, investigatorId, customizations, playerColor, commandMa
        deckPos,
        Zones.getDefaultCardRotation(playerColor, zone),
        true, -- Sort deck
-        Callback)
+        callback)
+
      coroutine.yield(0)
    end