akkartik/pothi.love - Change F7STX4D5V4PUNCG7JKCC423JTPKX5KCHY5XECDDS2UW4QF5FXRTAC

resolve conflicts

Created by akkartik on December 29, 2023

F7STX4D5V4PUNCG7JKCC423JTPKX5KCHY5XECDDS2UW4QF5FXRTAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in 0010-initialize_editor at line 6 [6.542]
B:B[4.25394] → [5.526:563]
BD:B[4.25394] → [5.526:563]
∅:∅[5.563] → [7.877:907]
B:B[4.25394] → [7.877:907]
BD:B[4.25394] → [7.877:907]
```
		obj.editor.filename = obj.filename
		obj.editor.lines = obj.data
```

Insertion in 0010-initialize_editor at line 6 [6.542]

[8.1185]

[5.526]

		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 12 [6.542]
B:BD[6.936] → [3.335:338]
B:BD[4.25241] → [3.154:332]
BD:BD[4.25241] → [3.154:332]
B:BD[9.1335] → [3.334:334]
BD:BD[9.1335] → [3.334:334]
BD:BD[9.1335] → [3.334:334]
```
end
		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)
```
Solving an order conflict in 0010-initialize_editor at line 12 [6.542]
[2.1262]

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in 0010-initialize_editor at line 6 [6.542]

Insertion in 0010-initialize_editor at line 6 [6.542]

Deletion in 0010-initialize_editor at line 12 [6.542]

Solving an order conflict in 0010-initialize_editor at line 12 [6.542]