akkartik/mastodon-unfurl.love - Change ZM6AON3AYYLI75CD3P62YU62KKN4KWXLWPNWZ44XM4KCQ42JEUUQC

resolve conflicts

Created by akkartik on December 7, 2023

ZM6AON3AYYLI75CD3P62YU62KKN4KWXLWPNWZ44XM4KCQ42JEUUQC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 252 [6.2]
B:BD[5.67] → [2.626:626]
B:BD[7.1104] → [3.0:54]
BD:BD[7.1104] → [3.0:54]
BD:BD[7.1104] → [3.0:54]
```
      love.system.setClipboardText(warning_message())
```
Solving an order conflict in main.lua at line 252 [6.2]
[5.67]
[9.223]
Deletion in main.lua at line 276 [6.2]
B:BD[10.1581] → [2.638:638]

Replacement in Manual_tests.md at line 15 [12.1]

B:BD[11.40] → [2.1152:1288]

  - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.

[11.40]

[2.1288]

  - run with an untested version of LÖVE. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.

Insertion in Manual_tests.md at line 17 [12.1]

[2.1386]

[13.169]

  - create a couple of spuriously failing tests. Run with an untested version of LÖVE. Error message includes message about untested version.

Deletion in Manual_tests.md at line 22 [12.1]

B:BD[13.271] → [2.1388:1388]

B:BD[11.40] → [4.39:184]

BD:BD[11.40] → [4.39:184]

B:BD[14.2163] → [4.185:328]

BD:BD[14.2163] → [4.185:328]

  - run with an untested version of LÖVE. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
  - create a couple of spuriously failing tests. Run with an untested version of LÖVE. Error message includes message about untested version.

Solving an order conflict in Manual_tests.md at line 22 [12.1]
[13.271]
[15.158]

Deletion in Manual_tests.md at line 54 [12.1]

B:BD[16.16279] → [2.1390:1390]

B:BD[16.16279] → [4.332:332]

B:BD[17.211526] → [18.329:586]

BD:BD[17.211526] → [18.329:586]

B:BD[15.260] → [4.330:330]

BD:BD[15.260] → [4.330:330]

* run with an untested version of LÖVE. Error message pops up. Press a key. Text editor comes up, and doesn't receive the key. Press ctrl+e. Error pops up. Press a key. Source editor opens up. Press ctrl+e. Error pops up. Press a key. Text editor returns.

Solving an order conflict in Manual_tests.md at line 54 [12.1]
[16.16279]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 252 [6.2]

Solving an order conflict in main.lua at line 252 [6.2]

Deletion in main.lua at line 276 [6.2]

Replacement in Manual_tests.md at line 15 [12.1]

Insertion in Manual_tests.md at line 17 [12.1]

Deletion in Manual_tests.md at line 22 [12.1]

Solving an order conflict in Manual_tests.md at line 22 [12.1]

Deletion in Manual_tests.md at line 54 [12.1]

Solving an order conflict in Manual_tests.md at line 54 [12.1]