akkartik/driver.love - Change IEC2MBDFATELCRBZYQRAXFNMZGCPN6PJ7LIC47KY2IHJH7ZEXBAQC

Programming environment for editing various of my live apps without restarting them.

resolve conflicts

Created by akkartik on November 17, 2023

IEC2MBDFATELCRBZYQRAXFNMZGCPN6PJ7LIC47KY2IHJH7ZEXBAQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in main.lua at line 77 [9.2]
B:B[7.2502] → [8.585:637]
BD:B[7.2502] → [8.585:637]
```
  HUD_font = love.graphics.newFont(HUD_font_height)
```
Resurrecting zombie bytes in live.lua at line 48 [11.722]
B:B[10.247] → [2.8:54]
BD:B[10.247] → [2.8:54]
```
  Live.previous_run_time_error_check_time = 0
```
Resurrecting zombie bytes in Manual_tests.md at line 10 [13.1]
∅:∅[3.64] → [12.31:66]
B:B[14.58] → [12.31:66]
BD:B[14.58] → [12.31:66]
```
    - when connecting to a new app
```
Deletion in Manual_tests.md at line 11 [13.1]
B:BD[12.66] → [3.66:66]
B:BD[15.68] → [6.24:59]
BD:BD[15.68] → [6.24:59]
∅:D[6.59] → [16.48:48]
D:D[17.61] → [16.48:48]
BD:BD[14.58] → [16.48:48]
```
    - `default_map` absent/present
```
Solving an order conflict in Manual_tests.md at line 11 [13.1]
[12.66]
[18.158]