resolve conflicts

Nov 13, 2023, 4:06 AM

JZTUZQ35KJPQXO6BZN5QHX74CL5B64W4JRT2IVD2GUPI4RZTTYXAC

Dependencies

[2] DYA6N7BF Merge text0
[3] QRUFNFPP Merge text0
[4] AFDLKNAP resolve conflicts
[5] YJ6ASFBG yet another fork trying to integrate my live framework with everything else
[6] M7UODV5H Merge text0
[7] JOPVPUSA editing source code from within the app
[8] 44ZJJ5ST Merge text.love
[9] AJB4LFRB try to maintain a reasonable line width
[10] 4NUCYNB4 Merge text0
[11] AVTNUQYR basic test-enabled framework
[12] C3GUE45I Merge text.love
[13] 2CTN2IEF Merge lines.love
[14] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
[15] D2TYFYG2 Merge text.love
[16] KKMFQDR4 editing source code from within the app
[17] 36Z442IV back to commit 8123959e52f without code editing
[18] OTIBCAUJ love2d scaffold
[19] 5RLCALX5 Merge text0
[20] PJ5PQAQE record support for multiple versions
[21] JXI7KJSL Merge text0
[22] 2ZCXBDLY Merge text.love
[23] CYGNFOA5 Merge text0
[24] RTV7W3GU Merge text0
[25] Y5XAFGMW Merge text.love
[26] G2SVT3RO Merge text0
[27] PPUUN5VZ fix file_drop callback
[28] LRDM35CE app running again
[29] GQBMVYD4 Merge text.love
[30] RHARLLIQ Merge text0
[31] QMSYY47G Merge text0

edit in main.lua at line 155

[5.54]→[2.11:11](∅→∅),[5.5763]→[4.18:18](∅→∅),[5.5763]→[4.18:18](∅→∅)
resolve order conflict in main.lua at line 155

[5.54]

[5.183]
edit in main.lua at line 166

[5.40]→[3.247:247](∅→∅),[5.6071]→[4.20:20](∅→∅),[5.6071]→[4.20:20](∅→∅)
resolve order conflict in main.lua at line 166

[5.40]

[5.416]
edit in main.lua at line 228

[5.1283]→[3.249:249](∅→∅),[5.67]→[4.24:24](∅→∅),[5.67]→[4.24:24](∅→∅)
resolve order conflict in main.lua at line 228

[5.1283]

[5.223]
edit in main.lua at line 252

[5.87]→[3.291:291](∅→∅),[5.507]→[4.26:26](∅→∅),[5.507]→[4.26:26](∅→∅),[5.3019]→[4.16:16](∅→∅),[5.3019]→[4.16:16](∅→∅),[5.2814]→[4.14:14](∅→∅),[5.2814]→[4.14:14](∅→∅),[5.2567]→[4.12:12](∅→∅),[5.2567]→[4.12:12](∅→∅)
resolve order conflict in main.lua at line 252

[5.87]