akkartik/template-carousel-mobile - Change RIJI7U3QDJV6HAACHR5XOTFJRHTD2MLOYWI7UCQZ4OHULRGHQGIQC

Template repo for tiny cross-platform apps that can be modified on phone, tablet or computer.

resolve conflicts

Created by akkartik on November 16, 2024

RIJI7U3QDJV6HAACHR5XOTFJRHTD2MLOYWI7UCQZ4OHULRGHQGIQC

Dependencies

In channels

main

Change contents

File deletion: 0075-clear_pane, 0075-clear_pane
BFD:BFD[6.2] → [7.904:943]
BFD:BFD[6.2] → [7.904:943]
BFD:BFD[7.943] → [7.674:674]
B:BD[9.99] → [4.127:183]
∅:D[4.183] → [9.99:145]
```
	Current_pane.editor_state.next_save = Current_time + 3
	edit.clear(Current_pane.output_editor_state)
```
Resurrecting zombie bytes in 0021-draw_menu at line 16 [13.704]
B:B[10.4587] → [11.0:29]
BD:B[10.4587] → [11.0:29]
BD:B[10.4587] → [11.0:29]
```
	x, y = copy_button(x, y, r)
```
Insertion in 0021-draw_menu at line 17 [13.704]
[11.29]
[2.1271]
```
	x, y = paste_button(x, y, r)
```
Deletion in 0021-draw_menu at line 41 [13.704]
B:BD[15.5795] → [3.1125:1128]
B:BD[11.29] → [5.0:30]
BD:BD[11.29] → [5.0:30]
```
end
	x, y = paste_button(x, y, r)
```
Solving an order conflict in 0021-draw_menu at line 41 [13.704]
[16.2898]