resolve conflicts

akkartik

Dec 7, 2023, 7:11 AM

EH7ZLCK2JC5WI6Y64IEURBWNCUMH54O6QHNKPK5HVJOQGOVTLOKAC

Dependencies

• [2] ORT3S3QE Merge lines.love
• [3] KGBSEDPF Merge lines.love
• [4] YGCT2D2O start loading settings as applicable
• [5] JM7XDUPA Merge lines.love
• [6] KKMFQDR4 editing source code from within the app
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 132
  [3.639]→[2.17:17](∅→∅)
  −