akkartik/etch.love - Change YA3CBQ34NF2P57KTXI5W5ROLBKAC6CCGRRWW3R7ZQVJBQ32MK65QC

A slate to write and draw on, then export to html

resolve conflicts

Created by akkartik on June 28, 2024

YA3CBQ34NF2P57KTXI5W5ROLBKAC6CCGRRWW3R7ZQVJBQ32MK65QC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 1011 [5.1]
B:BD[4.255] → [2.5:5]
B:BD[6.5461] → [3.643:691]
BD:BD[6.5461] → [3.643:691]
BD:BD[6.5461] → [3.643:691]
```
    State.cursor1 = deepcopy(State.screen_top1)
```
Solving an order conflict in text.lua at line 1011 [5.1]
[4.255]
[8.1156]
Deletion in source_text.lua at line 1081 [9.83723]
B:BD[9.145563] → [3.1335:1383]
BD:BD[9.145563] → [3.1335:1383]
BD:BD[9.145563] → [3.1335:1383]
```
    State.cursor1 = deepcopy(State.screen_top1)
```
Deletion in edit.lua at line 343 [11.413]
B:BD[10.1937] → [3.1535:1583]
BD:BD[10.1937] → [3.1535:1583]
BD:BD[10.1937] → [3.1535:1583]
```
    State.cursor1 = deepcopy(State.screen_top1)
```