resolve conflicts
Created by akkartik on December 29, 2023
HTQXU2NIXLWPTNBFA75USJ46IKXM3IKOIX2GGUI4ZEGSAW24HGFAC Dependencies
- [2]
JEU6WFE4P76EHWWJ3DFX32WVHP3JFNUOHZ7LCNWKESVXSRAGU5TQC - [3]
LL75IMFITLSRFWKHRYMTFS3IWZFYQYWP3JNXT2GHHU2Z25O5NFIAC - [4]
KV64IWA3DKR4FL6E4BIG5SFCRQJ3DZFEJOUELCD5TC7DDVJQ6SWAC - [5]
I2PYG3S2O5SXMSE5PFMXH3TGQDYBXA4UMLSCRCY67PKRN2HTZE2QC - [6]
WKMW7PCE75A5CFXF5GPL5HQ4ZNASFOFQFHASOQ7LABSQKWU3KEGAC - [7]
KI6LF2LF2LK6Q7SRWN3U4TJ25Y6BGJ2M3AU5FUTN6JIVA2MUBEXAC
In channels
main
Change contents
Replacement in 0010-initialize_editor at line 5 [4.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)Deletion in 0010-initialize_editor at line 12 [4.542]
Solving an order conflict in 0010-initialize_editor at line 12 [4.542]
[2.506]