akkartik/carousel.love - Change TDXO2NXXQRU6CQLZTRBA7PBD2735SKJ4HIORDBIPQJ464W6RDBPQC

A lightweight programming environment for desktop and mobile devices

resolve conflicts

Created by akkartik on July 10, 2024

TDXO2NXXQRU6CQLZTRBA7PBD2735SKJ4HIORDBIPQJ464W6RDBPQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 63 [5.1]
B:B[4.151] → [2.4:24]
BD:B[4.151] → [2.4:24]
```
      App.color(fg)
```
Insertion in text.lua at line 63 [5.1]
[6.2604]
[2.4]
```
      -- render screen line
```
Deletion in text.lua at line 65 [5.1]
B:BD[6.2604] → [3.4:32]
BD:BD[6.2604] → [3.4:32]
```
      -- render screen line
```
Solving an order conflict in text.lua at line 65 [5.1]
[2.24]
[4.179]