akkartik/template-carousel-mobile - Change TVSDIF6DIKJNK6IHHNHLKEO56GY4HS7LVQGJQ4GMNS2RF4YJJ2NAC

resolve conflicts

Created by akkartik on December 3, 2023

TVSDIF6DIKJNK6IHHNHLKEO56GY4HS7LVQGJQ4GMNS2RF4YJJ2NAC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 18 [9.2]

B:BD[8.63] → [3.11:121]

  Supported_versions = {'11.4', '11.3', '11.2', '11.1', '11.0', '12.0'}  -- put the recommended version first

[8.63]

[10.11]

  Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '12.0'}  -- put the recommended version first

Deletion in main.lua at line 34 [9.2]

B:BD[11.198] → [6.20:112]

BD:BD[11.198] → [6.20:112]

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

Deletion in main.lua at line 268 [9.2]
B:BD[12.507] → [4.26:26]
B:BD[13.190302] → [14.20:112]
BD:BD[13.190302] → [14.20:112]
BD:BD[13.190302] → [14.20:112]
```
  if Current_app == 'error' then
    Current_app = 'run'
  elseif Current_app == 'run' then
```
Solving an order conflict in main.lua at line 268 [9.2]
[12.507]
Deletion in app.lua at line 10 [17.2]
B:BD[17.54] → [8.1125:1147]
```
  App.version_check()
```
Deletion in app.lua at line 18 [17.2]
B:BD[13.209821] → [5.0:22]
BD:BD[13.209821] → [5.0:22]
```
  App.version_check()
```
Solving an order conflict in app.lua at line 18 [17.2]
[16.8463]
[18.258]
Insertion in app.lua at line 19 [17.2]
[18.276]
[16.8464]
```
  App.version_check()
```

Resurrecting zombie bytes in Manual_tests.md at line 14 [20.1]

B:B[19.685] → [7.39:179]

BD:B[19.685] → [7.39:179]


  - 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.

Solving an order conflict in Manual_tests.md at line 14 [20.1]
[21.751]
[7.39]

Insertion in Manual_tests.md at line 16 [20.1]

[7.179]

[22.158]


Code loading:
* run love with directory; text editor runs
* run love with zip file; text editor runs

Deletion in Manual_tests.md at line 26 [20.1]

B:BD[13.211526] → [5.23:238]

BD:BD[13.211526] → [5.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.

resolve conflicts

Dependencies

In channels

Change contents

Replacement in main.lua at line 18 [9.2]

Deletion in main.lua at line 34 [9.2]

Deletion in main.lua at line 268 [9.2]

Solving an order conflict in main.lua at line 268 [9.2]

Deletion in app.lua at line 10 [17.2]

Deletion in app.lua at line 18 [17.2]

Solving an order conflict in app.lua at line 18 [17.2]

Insertion in app.lua at line 19 [17.2]

Resurrecting zombie bytes in Manual_tests.md at line 14 [20.1]

Solving an order conflict in Manual_tests.md at line 14 [20.1]

Insertion in Manual_tests.md at line 16 [20.1]

Deletion in Manual_tests.md at line 26 [20.1]