resolve conflicts

akkartik

Feb 8, 2024, 11:03 AM

O6GGP2B27I4CG5C74S67NKWORKJKOUVHFWBWMPWSPUH73ST4O66QC

Dependencies

• [2] BTMACW42 resolve conflicts
• [3] QWPQUVBR provide a place to set the font
• [4] ARLTID7G replace some calls with my names
• [5] OE26XIQO bring back syntax highlighting (but so ugly)
• [6] VUF2SX7B implement carousel buttons for inserting/switching current pane
• [7] RJPNFXVQ new fork: a personal dashboard for mobile devices
• [8] 3DRVHB7C run script on startup; new button to switch to source editor
• [9] UUAIVZ4U 2 bugfixes in font rendering
• [10] Q4CJ4WWU switch to a single global output editor
• [11] SIASJPGR save the list of open files across restart
• [12] PRE6XPRN responsively increase/decrease font height
• [13] 5RUFNRJO start of the visual skeleton
• [14] AZMYKWMH resolve conflicts
• [15] LRG2TNA7 screens now run
• [16] 2AZCZD6X Lua Carousel now tested to load/save screens from/to save dir.
• [17] ROYQO45B mount old location of screens if possible
• [*] ZM7NOBRM new fork: carousel shell

Change contents

• edit in 0032-update_font_settings at line 26
  [4.1267]→[2.203:203](∅→∅),[2.203]→[2.204:207](∅→∅),[4.1118]→[3.411:414](∅→∅)
  −

  − end

  − end
• resolve order conflict in 0032-update_font_settings at line 26
  [4.1267]
• edit in 0032-update_font_settings at line 26
  [0.136]
  + end
• edit in 0011-on.initialize at line 28
  [4.1887]→[4.173:176](∅→∅),[4.2347]→[4.173:176](∅→∅),[4.2347]→[3.560:563](∅→∅),[4.2347]→[3.560:563](∅→∅)
  − end

  − end
• resolve order conflict in 0011-on.initialize at line 28
  [4.1887]
• edit in 0011-on.initialize at line 28
  [0.162]
  + end