resolve conflicts
Created by akkartik on December 29, 2023
LL75IMFITLSRFWKHRYMTFS3IWZFYQYWP3JNXT2GHHU2Z25O5NFIAC Dependencies
In channels
main
Change contents
Replacement in 0010-initialize_editor at line 6 [3.542]
obj.editor = edit.initialize_state(vy(obj.y), math.floor(vx(obj.x)), math.ceil(vx(obj.x+obj.w)), scaled_fontsize, scaled_lineheight)obj.editor = edit.initialize_state(vy(obj.y), math.floor(vx(obj.x)), math.ceil(vx(obj.x+obj.w)), love.graphics.getFont(), scaled_fontsize, scaled_lineheight)