resolve conflicts

akkartik

Nov 17, 2023, 11:49 PM

FDYORR2O3FBEQAB2CYATDQLKH2P57OOCP5IX6XC3RYHMIC5BHDAAC

Dependencies

• [2] ZM7NOBRM new fork: carousel shell
• [3] JPAF3IDJ support high-DPI devices
• [4] FM5LDKGT Merge text.love
• [5] QW7YRY25 Merge text0
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 148
  [4.930]→[3.10:136](∅→∅)
  − App.screen.width = love.window.fromPixels(App.screen.width)

  − App.screen.height = love.window.fromPixels(App.screen.height)
• resolve order conflict in main.lua at line 148
  [2.4241]

  [4.930]