resolve conflicts

akkartik

Sep 11, 2024, 3:28 AM

4LSZFSOQU4VKJNTH6YWG3R64RLCGLWIQQOCYRGA4LSQGVCL27BRQC

Dependencies

• [2] OLX2RRDI Merge text0
• [3] 7LXXQBNE resolve conflicts
• [4] LRDM35CE app running again
• [5] T7QIIGQ6 attempt at better error recovery
• [6] 36Z442IV back to commit 8123959e52f without code editing
• [7] PJ5PQAQE record support for multiple versions
• [8] WZZGVKSG a few more renames
• [9] 2RWR3GM4 another missed rename
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 186
  [4.113]→[2.11:11](∅→∅),[4.6894]→[3.11:84](∅→∅),[4.6894]→[3.11:84](∅→∅)
  −

  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• resolve order conflict in main.lua at line 186
  [4.113]

  [4.6955]