From 246c10df0b8f74488b2b66ade10f014e7451c870 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Sat, 25 Apr 2020 12:22:16 +0200 Subject: [PATCH] True --- demo.lua | 6 ------ 1 file changed, 6 deletions(-) diff --git a/demo.lua b/demo.lua index d483bb7..dc40427 100644 --- a/demo.lua +++ b/demo.lua @@ -53,17 +53,11 @@ for i = 1, 12, 1 do file:write("}") end -<<<<<<< HEAD file:write("\ndraw(", math.floor(192 - image_infos.width / 2), ",") file:write(math.floor(96 - image_infos.height / 2), ",data,pallet,") file:write(image_infos.width, ")") first = false -======= - file:write("}\ndraw(", math.floor(192 - image_infos.width / 2), ",") - file:write(math.floor(96 - image_infos.height / 2), ",data,pallet,") - file:write(image_infos.width, ")") ->>>>>>> dc863ec6136d72e041c5f550bba9eb5d84f343c5 end file:close()