Properly merge mcl_craftguide

2021-01-03 15:23:29 +01:00 · 2021-01-03 15:23:29 +01:00 · 1fda78667f
commit 1fda78667f
parent 6b2416b211
1 changed files with 0 additions and 4 deletions
--- a/mods/HELP/mcl_craftguide/init.lua
+++ b/mods/HELP/mcl_craftguide/init.lua
@ -1113,15 +1113,11 @@ if progressive_mode then
 			inv_items = {}
 		end

-<<<<<<< HEAD
 		if not data or not data.inv_items then
 			return
 		end

-		meta:set_string("inv_items", serialize(data.inv_items))
-=======
 		meta:set_string("inv_items", serialize(inv_items))
->>>>>>> 4c2f3f2b7cea5b132d7485b4d54def1fe72b8e46
 	end

 	M.register_on_leaveplayer(function(player)