resolve conflicts

akkartik

Sep 19, 2024, 9:45 PM

O37AGRKM4EKETKMUHQCOVEPEI3PAAU5OPMXMOZ5574BPGCYFDABQC

Dependencies

• [2] ZM7NOBRM new fork: carousel shell
• [3] AFWZYZNQ resolve conflicts
• [4] JMA2BLDK Merge lines.love
• [5] SFDYC6DL transparent highlights work with more colors
• [6] MD3W5IRA new fork: rip out drawing support
• [7] 4KC7I3E2 make colors easier to edit
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• resurrect zombie in edit.lua at line 5
  [4.839]→[2.4247:4289](∅→∅),[4.839]→[2.4247:4289](∅→∅)
  + Line_number_color = {r=0.4, g=0.4, b=0.4}
• edit in edit.lua at line 5
  [4.519]

  [2.4247]
  + Highlight_color = {r=0.7, g=0.7, b=0.9, a=0.4} -- selected text
• edit in edit.lua at line 7
  [4.781]→[4.29:94](∅→∅)
  − Highlight_color = {r=0.7, g=0.7, b=0.9, a=0.4} -- selected text
• resolve order conflict in edit.lua at line 7
  [2.4289]

  [4.997]