From 9ca013590dbc20fc8a15bd6e0f79b0295b562d50 Mon Sep 17 00:00:00 2001 From: TheAIBot Date: Sat, 1 Oct 2016 02:27:08 +0200 Subject: [PATCH] fixed merge error --- clusterio_0.0.2/control.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/clusterio_0.0.2/control.lua b/clusterio_0.0.2/control.lua index 27b26855..5294d3a2 100644 --- a/clusterio_0.0.2/control.lua +++ b/clusterio_0.0.2/control.lua @@ -318,10 +318,6 @@ remote.add_interface("clusterio", end, importMany = function(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 itemName, itemCount in pairs(item) do GiveItemsToStorage(itemName, itemCount)