resolve merge conflict (again!!)

2022-12-06 11:34:49 +01:00 · 2022-12-06 11:34:49 +01:00 · 5b0cdf942d
commit 5b0cdf942d
parent c84e8a2101
1 changed files with 5 additions and 5 deletions
--- a/src/arkhamdb/DeckImporterMain.ttslua
+++ b/src/arkhamdb/DeckImporterMain.ttslua
@ -388,11 +388,11 @@ function loadCards(slots, investigatorId, customizations, playerColor, commandMa
        spreadCallback = function(deck) deck.spread(spreadDistance) end
      end
      Spawner.spawnCards(
-        zoneCards,
-        deckPos,
-        Zones.getDefaultCardRotation(playerColor, zone),
-        true, -- Sort deck
-        callback)
+          zoneCards,
+          deckPos,
+          Zones.getDefaultCardRotation(playerColor, zone),
+          true, -- Sort deck
+          callback)

      coroutine.yield(0)
    end