akkartik/techmeet-capture.love - Change TG3DFQG5NGMWZSPINT2TFSGBRRUKGRAC3S3RM4CGE3Q7Y4457Z4QC

resolve conflicts

Created by akkartik on December 3, 2023

TG3DFQG5NGMWZSPINT2TFSGBRRUKGRAC3S3RM4CGE3Q7Y4457Z4QC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 80 [7.2]

B:BD[3.198] → [3.198:282]

  local supported_versions = {'11.4', '12.0'}  -- put the recommended version first

[3.198]

[3.282]

  local supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first

Deletion in main.lua at line 90 [7.2]
B:BD[8.437] → [4.59:59]
B:BD[9.198] → [5.20:112]
BD:BD[9.198] → [5.20:112]
```
  local supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first
```
Solving an order conflict in main.lua at line 90 [7.2]
[8.437]
[10.186725]

Insertion in Manual_tests.md at line 32 [11.1]

[10.211526]

[8.907]

* run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key. Press ctrl+e to edit source. Source editor opens up without checking version.

Deletion in Manual_tests.md at line 37 [11.1]

B:BD[10.211526] → [6.23:238]

* run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key. Press ctrl+e to edit source. Source editor opens up without checking version.

Solving an order conflict in Manual_tests.md at line 37 [11.1]
[2.328]
[10.211526]

resolve conflicts

Dependencies

In channels

Change contents

Replacement in main.lua at line 80 [7.2]

Deletion in main.lua at line 90 [7.2]

Solving an order conflict in main.lua at line 90 [7.2]

Insertion in Manual_tests.md at line 32 [11.1]

Deletion in Manual_tests.md at line 37 [11.1]

Solving an order conflict in Manual_tests.md at line 37 [11.1]