resolve conflicts
Created by akkartik on December 29, 2023
N6USMULMPX3M4HOCYWEGVLX4USWHHKX233GFV7Q4Z6K3ZS262GMAC Dependencies
- [2]
JXSYRD4ETUECFNGPESJGVQEOFLBN5CFV6ABTM5GGVCRVKX6SPCJQC - [3]
KMK6BAPGYMHMJ4XVDCHYJHRACP4NDCIQKHMDIKOCKSAO3H4CNLTAC - [4]
YD46MI2FYKOWUUVGYRRRSDEXYJUJKZO5RFVUBJBCNMZYVS3MXDAQC - [5]
MYSB7QNIZPXKWIWQBZWYIFY46HHKENB6VPYLO2ME2JSJVGRJPQ6QC - [6]
KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC - [7]
4GTXUOCR2KDMNWKHM53VR4BVWDP6RGCEBVSPUTDNSWFJK3F3NLQQC - [8]
HXJ2I2OHQVQOASWIHEXMXBXM5EPDD2UP6NKAILV3IXIMXPOKTHBAC
In channels
main
Change contents
Deletion in run.lua at line 86 [6.178044]
Replacement in run.lua at line 87 [6.178044]
Editor_state = edit.initialize_state(Margin_top, 45 + Margin_left, App.screen.width-Margin_right, font, Font_height, Line_height)Editor_state = edit.initialize_state(Menu_bar_height + Margin_top, Margin_left, App.screen.width-Margin_right, font, Font_height, Line_height)Resurrecting zombie bytes in run.lua at line 96 [6.178044]
Deletion in run.lua at line 97 [6.178044]
Editor_state = edit.initialize_state(Menu_bar_height + Margin_top, Margin_left, App.screen.width-Margin_right)Editor_state.font_height = Font_heightEditor_state.line_height = Line_heightSolving an order conflict in run.lua at line 97 [6.178044]
Replacement in run.lua at line 98 [6.178044]
Editor_state = edit.initialize_state(Margin_top, 45 + Margin_left, App.screen.width-Margin_right, font, Font_height, Line_height)Editor_state = edit.initialize_state(Menu_bar_height + Margin_top, Margin_left, App.screen.width-Margin_right, font, Font_height, Line_height)