summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorheav-4 <heavpoot@gmail.com>2022-02-12 07:56:06 +0000
committerheav-4 <heavpoot@gmail.com>2022-02-12 07:56:06 +0000
commita408134fea9123297cc96456df36dd341bc488dc (patch)
tree905d63fb60b87ac3830022cc6a989c61a09c7b9f
parent7ab7b74e43aff61dae21c4e65d85b4c697d3db25 (diff)
oh bee
-rw-r--r--mods/vzxv_itemstacks/container.lua4
1 files changed, 0 insertions, 4 deletions
diff --git a/mods/vzxv_itemstacks/container.lua b/mods/vzxv_itemstacks/container.lua
index a3ff770..be6d7d9 100644
--- a/mods/vzxv_itemstacks/container.lua
+++ b/mods/vzxv_itemstacks/container.lua
@@ -8,11 +8,7 @@ local function update_container_entity(entity, stack)
collide_with_objects = false,
visual = "wielditem",
visual_size = {x = 0.4, y = 0.4},
-<<<<<<< HEAD
wield_item = stack:get_name(),
-=======
- wield_item = stack.name,
->>>>>>> 9b13c852c4621f76e206c9a88844e67595dcf3a9
static_save = false,
}
end