Update

2021-07-07 11:05:50 +02:00 · 2021-07-07 11:05:50 +02:00 · 4ce4c5c8c1
parent 1ad368e9ce 54ed8e700d
commit 4ce4c5c8c1
1 changed files with 4 additions and 0 deletions
--- a/i3_mods_tabs.lua
+++ b/i3_mods_tabs.lua
@ -133,7 +133,11 @@ i3.new_tab {
 			local formspec = get_skin_info_formspec(skin, 3, 2)
 			fs(formspec)
 			
+<<<<<<< HEAD
 			--core.log("fs skins: ",dump(formspec))
+=======
+			core.log("fs skins: ",dump(formspec))
+>>>>>>> 54ed8e700d73a97b03df92a2e0a9d1b6225ce6b4
 	end,
 	
 	fields = function(player, data, fields)