resolve merge conflict

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