akkartik/pothi.love - Change ZZ5FLAVK2TI73U3KC7PAF3KFDRVHNFU4ICYGQTS6G4QFEVZYEFCQC

resolve conflicts

Created by akkartik on December 29, 2023

ZZ5FLAVK2TI73U3KC7PAF3KFDRVHNFU4ICYGQTS6G4QFEVZYEFCQC

Dependencies

In channels

main

Change contents

Replacement in 0010-initialize_editor at line 7 [5.542]

B:BD[4.25241] → [4.25241:25394]

		obj.editor = edit.initialize_state(Menu_bar_height + vy(obj.y), math.floor(vx(obj.x)), math.ceil(vx(obj.x+obj.w)), scaled_fontsize, scaled_lineheight)

[4.25241]

[4.25394]

		obj.editor = edit.initialize_state(Menu_bar_height + 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 10 [5.542]

B:BD[6.1335] → [2.1187:1187]

B:BD[7.5541] → [3.53:213]

BD:BD[7.5541] → [3.53:213]

		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)

Solving an order conflict in 0010-initialize_editor at line 10 [5.542]
[6.1335]
[5.859]
Replacement in 0010-initialize_editor at line 13 [5.542]
B:BD[5.936] → [4.25524:25528]
```
end
```
[5.936]
```
end
```