akkartik/carousel.love - Change AQZ7YIX5GWZTE2SAMFOWHAUYYLFLKPG423R6PJOP6RDFIXXPVHFQC

resolve conflicts

Created by akkartik on December 29, 2023

AQZ7YIX5GWZTE2SAMFOWHAUYYLFLKPG423R6PJOP6RDFIXXPVHFQC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 21 [4.413]

B:BD[4.596] → [5.469:552]

B:BD[4.596] → [6.1167:1295]

function edit.initialize_state(top, bottom, left, right, font_height, line_height)
function edit.initialize_state(top, left, right, font, font_height, line_height)  -- currently always draws to bottom of screen

[4.596]

[7.94319]

function edit.initialize_state(top, bottom, left, right, font, font_height, line_height)

Resurrecting zombie bytes in edit.lua at line 112 [4.413]
B:B[8.58] → [9.740:802]
BD:B[8.58] → [9.740:802]
```
function edit.draw(State, fg, hide_cursor, show_line_numbers)
```
Deletion in edit.lua at line 113 [4.413]
∅:D[9.802] → [10.16:16]
BD:BD[11.58] → [10.16:16]
B:BD[11.58] → [3.143:143]
BD:BD[11.58] → [3.143:143]
Solving an order conflict in edit.lua at line 113 [4.413]
[9.802]
[12.1603]
Replacement in 0070-code_editor_state at line 7 [13.2519]
B:BD[13.2772] → [2.788:817]
```
			Font_height, Line_height)
```
[13.2772]
[13.2825]
```
			Font, Font_height, Line_height)
```
Replacement in 0069-output_editor_state at line 6 [13.2917]
B:BD[13.3102] → [2.819:848]
```
			Font_height, Line_height)
```
[13.3102]
[13.3155]
```
			Font, Font_height, Line_height)
```

resolve conflicts

Dependencies

In channels

Change contents

Replacement in edit.lua at line 21 [4.413]

Resurrecting zombie bytes in edit.lua at line 112 [4.413]

Deletion in edit.lua at line 113 [4.413]

Solving an order conflict in edit.lua at line 113 [4.413]

Replacement in 0070-code_editor_state at line 7 [13.2519]

Replacement in 0069-output_editor_state at line 6 [13.2917]