resolve conflicts

akkartik

Nov 12, 2025, 7:24 PM

IMHZR5CEMLADCSH2JO3MV2PB25RFMJEU7Y5BCHHJGC2U5CW5KXNQC

Dependencies

• [2] ZM7NOBRM new fork: carousel shell
• [3] 67PWAM7G resolve conflicts
• [4] ULKNZUZK resolve conflicts
• [5] 2CTN2IEF Merge lines.love
• [6] SDRXK4X5 move
• [7] JOPVPUSA editing source code from within the app
• [8] 67LE44HU drop an unused var
• [9] OI4FPFIN support drawings in the source editor
• [10] KKMFQDR4 editing source code from within the app
• [11] K464QQR4 more defensive resize handling
• [12] 3PSFWAIL Merge lines.love
• [13] 36Z442IV back to commit 8123959e52f without code editing
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 25
  [4.2189]

  [2.4036]
  +

  + OS = love.system.getOS()
• resolve order conflict in main.lua at line 29
  [2.4072]

  [3.13]
• edit in main.lua at line 30
  [3.14]→[3.14:41](∅→∅),[3.41]→[4.23433:23433](∅→∅),[4.2189]→[4.23433:23433](∅→∅),[2.4072]→[4.23433:23433](∅→∅),[4.184680]→[4.23433:23433](∅→∅),[4.23433]→[4.24812:24813](∅→∅),[4.184859]→[4.24812:24813](∅→∅)
  − OS = love.system.getOS()

  −

  −