resolve conflicts
Created by akkartik on December 7, 2023
QKHCQXOHLG62ISP7ETRP4RH6A3A532BXURNZ3374IUDVML2SK2RQC Dependencies
- [2]
6XLI6GURIVGWW7MOXND4BJVUNZJMJVGKRC3HAC3BBHWXMTI6ADHAC - [3]
AKEXQV6ANSXTPB64YOKNYKIPYG7QMEHKPPDLTMCNQMJND5BBTN2QC - [4]
VPRGENLAJTF52YSY6NNZAPWQOD2TLP7DJU7DAAWGL4WFHOYAZF5QC - [5]
OTIBCAUJ3KDQJLVDN3A536DLZGNRYMGJLORZVR3WLCGXGO6UGO6AC - [6]
KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC - [7]
BJ5X5O4ACBBJ56LRBBSTCW6IBQP4HAEOOOPNH3SKTA4F66YTOIDAC - [8]
57OGXVHZ44WNWVKNCMPJT7SAOF4MR4GXJ4ZQKHUFAKLZBB6ERDLAC - [9]
2SAJWSNK5BCDDW5P6GFU7BCL45LBATQQS3SYP6PBLTN4DCXICVZQC
In channels
main
Change contents
Deletion in main.lua at line 370 [5.2]
Replacement in Manual_tests.md at line 34 [7.1]
* run with an untested version. 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.* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.* 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.Deletion in Manual_tests.md at line 39 [7.1]
* 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 39 [7.1]