akkartik/pensieve.love - Change QDUCYGB6LZA3AXLPJN2AVEOPDPSQBNLM53WNOALPYRWKVXMSRBBAC

resolve conflicts

Created by akkartik on July 22, 2024

QDUCYGB6LZA3AXLPJN2AVEOPDPSQBNLM53WNOALPYRWKVXMSRBBAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 223 [9.1]
B:B[8.1180] → [3.3:76]
BD:B[8.1180] → [3.3:76]
```
--?   print('chord', chord, State.selection1.line, State.selection1.pos)
```
Resurrecting zombie bytes in text.lua at line 224 [9.1]
B:B[10.121] → [6.4:59]
BD:B[10.121] → [6.4:59]
```
  --== shortcuts that mutate text (must schedule_save)
```
Solving an order conflict in text.lua at line 224 [9.1]
[3.76]
[6.4]
Resurrecting zombie bytes in text.lua at line 229 [9.1]
B:B[10.192] → [12.69:136]
BD:B[10.192] → [12.69:136]
```
    if State.cursor_y > App.screen.height - State.line_height then
```

Insertion in README.md at line 131 [14.6]

[13.131]

[2.71]

* https://codeberg.org/eril/lines2html.love provides the option to export
  just the drawings to a directory. Also provides a CLI, which should be more
  natural for many people.

Deletion in README.md at line 142 [14.6]

B:BD[15.243] → [4.939:939]

B:BD[13.131] → [5.0:179]

BD:BD[13.131] → [5.0:179]

* https://codeberg.org/eril/lines2html.love provides the option to export
  just the drawings to a directory. Also provides a CLI, which should be more
  natural for many people.

Solving an order conflict in README.md at line 142 [14.6]
[15.243]

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text.lua at line 223 [9.1]

Resurrecting zombie bytes in text.lua at line 224 [9.1]

Solving an order conflict in text.lua at line 224 [9.1]

Resurrecting zombie bytes in text.lua at line 229 [9.1]

Insertion in README.md at line 131 [14.6]

Deletion in README.md at line 142 [14.6]

Solving an order conflict in README.md at line 142 [14.6]