mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 16:13:12 +09:00
fixed merge error
This commit is contained in:
1 parent
72cef84df5
commit
9ca013590d
1 file changed
-4
@@ -318,10 +318,6 @@ remote.add_interface("clusterio",
|
|||||||
end,
|
end,
|
||||||
importMany = function(jsonString)
|
importMany = function(jsonString)
|
||||||
local items = json:decode(jsonString)
|
local items = json:decode(jsonString)
|
||||||
<<<<<<< HEAD
|
|
||||||
game.print(serpent.block(items))
|
|
||||||
=======
|
|
||||||
>>>>>>> refs/remotes/origin/json-parser
|
|
||||||
for k, item in pairs(items) do
|
for k, item in pairs(items) do
|
||||||
for itemName, itemCount in pairs(item) do
|
for itemName, itemCount in pairs(item) do
|
||||||
GiveItemsToStorage(itemName, itemCount)
|
GiveItemsToStorage(itemName, itemCount)
|
||||||
|
|||||||
Reference in new issue
Block a user