akkartik/techmeet.love - Change R2DITAZZJNA3QJ3QQ3Y6FB6VNFRP5UXDMNJ64SRYVXDAN5PIPWUAC

Collaborative wiki for a few of us. Fork of lines.love.

Merge upstream into main

Created by Kartik K. Agaram on July 26, 2022

R2DITAZZJNA3QJ3QQ3Y6FB6VNFRP5UXDMNJ64SRYVXDAN5PIPWUAC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 110 [6.2]
B:BD[5.2757] → [3.9:9]
B:BD[7.85345] → [4.8:41]
BD:BD[7.85345] → [4.8:41]
BD:BD[7.85345] → [4.8:41]
B:BD[9.383] → [4.42:75]
BD:BD[9.383] → [4.42:75]
BD:BD[9.383] → [4.42:75]
```
    load_from_disk(Editor_state)
    load_from_disk(Editor_state)
```
Solving an order conflict in main.lua at line 110 [6.2]
[5.2757]
[10.296]
Deletion in main.lua at line 152 [6.2]
B:BD[7.86574] → [4.76:107]
BD:BD[7.86574] → [4.76:107]
```
    save_to_disk(Editor_state)
```
Solving an order conflict in main.lua at line 152 [6.2]
[5.3992]
[11.500]

Replacement in main.lua at line 170 [6.2]

B:BD[12.279] → [2.115:214]

    Cache[id] = {lines=load_from_disk(Directory..id), left=0, right=Display_settings.column_width}

[12.279]

[12.376]

    Cache[id] = {filename=Directory..id, left=0, right=Display_settings.column_width}
    load_from_disk(Cache[id])

Resurrecting zombie bytes in edit.lua at line 206 [14.413]
B:B[13.4441] → [12.1204:1241]
BD:B[13.4441] → [12.1204:1241]
```
--?     print('next save', State.id)
```
Solving an order conflict in edit.lua at line 207 [14.413]
[12.1241]
[4.446]