akkartik/sokoban.love - Change F26BRBBLDOA5TSNAIWFVB3MZYPHDINPYYDWWPO6EBP4EOUHXHLVQC

resolve conflicts

Created by akkartik on September 27, 2024

F26BRBBLDOA5TSNAIWFVB3MZYPHDINPYYDWWPO6EBP4EOUHXHLVQC

Dependencies

[2] TBTKFVCEHHGHQ3JOZNLOT4PXUYMUGGM4C62KUP7N2KBHIEMXITPQC
[3] 2SE2CRDRZYSNDLVDE4WV7OQATB4IPFLGH44XB2YM6EUMVH3UFL4QC
[4] I52S4E5FT6E6FHH3QEDJPWO7C6W7AIMAFDP2KQ5FEWXFQX7RY6CAC
[5] Q4CJ4WWUFEW46IA4IWVQZAWW2RS2SO7UDYIXYPPHMBVSK5ZJYJRAC
[6] 4HCP3NTOPDNYUHD666O3BOGZEZDTP3YJHWKLSTI5J4DBDFQ6QYDAC
[7] ZM7NOBRMD5HHA35Y4JDC76EOA2RD4KQOQCPURXYKXA6ABMKOJIGQC
[8] RK2ASPN7A55RCEG2YRFZLFXNPSME2VKBE2ZXO257DYZPS5TPXC5QC

In channels

main

Change contents

Deletion in 0050-print_to_output at line 5 [4.1410]
B:BD[4.1566] → [5.1084:1122]
```
	Text.redraw_all(Output_editor_state)
```

Insertion in 0012-on.draw at line 20 [7.2899]

[6.37]

[2.197]

		if #Output_editor_state.lines ~= #Output_editor_state.line_cache then
			Text.redraw_all(Output_editor_state)
		end

Deletion in 0012-on.draw at line 26 [7.2899]

B:BD[6.37] → [3.0:157]

BD:BD[6.37] → [3.0:157]

		if #Current_pane.output_editor_state.lines ~= #Current_pane.output_editor_state.line_cache then
			Text.redraw_all(Current_pane.output_editor_state)
		end

Solving an order conflict in 0012-on.draw at line 26 [7.2899]
[2.327]
[8.8243]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in 0050-print_to_output at line 5 [4.1410]

Insertion in 0012-on.draw at line 20 [7.2899]

Deletion in 0012-on.draw at line 26 [7.2899]

Solving an order conflict in 0012-on.draw at line 26 [7.2899]