akkartik/carousel.love - Change PZYSWJZC7NCLRSIGF7EWZFHK3AH7R756CVWB3LJFKX7GEHHOFDQAC

A lightweight programming environment for desktop and mobile devices

resolve conflicts

Created by akkartik on September 1, 2024

PZYSWJZC7NCLRSIGF7EWZFHK3AH7R756CVWB3LJFKX7GEHHOFDQAC

Dependencies

In channels

main

Change contents

File un-deletion: source_text.lua, source_text.lua, source_text.lua, source_text.lua, source_text.lua
BFD:BF[9.147164] → [9.83786:83786]
BFD:BF[10.2] → [9.147125:147164]
BFD:BF[10.2] → [9.147125:147164]
BF:BF[9.147164] → [9.83786:83786]
BFD:BF[10.2] → [9.147125:147164]
BF:BF[9.147164] → [9.83786:83786]
BF:BF[10.2] → [9.147125:147164]
BFD:BFD[10.2] → [9.147125:147164]
File un-deletion: source_edit.lua, source_edit.lua, source_edit.lua, source_edit.lua, source_edit.lua
BFD:BF[9.165827] → [9.152503:152503]
BFD:BF[10.2] → [9.165788:165827]
BFD:BF[10.2] → [9.165788:165827]
BF:BF[9.165827] → [9.152503:152503]
BFD:BF[10.2] → [9.165788:165827]
BF:BF[9.165827] → [9.152503:152503]
BF:BF[10.2] → [9.165788:165827]
BFD:BFD[10.2] → [9.165788:165827]
Resurrecting zombie bytes in edit.lua at line 348 [12.413]
B:B[11.9064] → [7.365:427]
BD:B[11.9064] → [7.365:427]
```
    local s = Text.cut_selection_and_record_undo_event(State)
```
Solving an order conflict in edit.lua at line 348 [12.413]
[5.514]
[7.365]

Deletion in README.md at line 54 [14.6]

B:BD[13.15] → [3.18:135]

BD:BD[13.15] → [3.18:135]

* Undo/redo may be sluggish in editor windows containing large files. Large
  files may grow sluggish in other ways.

Deletion in README.md at line 55 [14.6]
B:BD[16.1375] → [17.16:17]