resolve conflicts

akkartik

Mar 11, 2024, 4:47 AM

3EQAFUFNRXBPAE5PYP36NNWFE4EESGOBTMFY3UNQV2EPHHP3PLUQC

Dependencies

• [2] 3PFDYZWT resolve conflicts
• [3] JX3PYEIS resolve conflicts
• [4] BPYWIU62 new fork: template for live programming with editor widgets
• [5] U6JNZOH4 Merge text0
• [6] D4FEFHQC flesh out Readme
• [7] 4VUVVW6J update Readme and settle on a project name
• [8] OJ2CLK4Q Merge text0
• [9] ADBLR7B4 new mirror
• [10] WHFOJBAE Merge text0
• [11] L5SYYGSB new mirror; also correct a typo
• [*] FS2ITYYH record a known issue

Change contents

• resurrect zombie in README.md at line 78
  [4.166]→[4.495:674](∅→∅),[4.166]→[4.495:674](∅→∅)
  + Its immediate upstream is [the template repo for freewheeling apps](https://git.sr.ht/~akkartik/template-live-editor).

  + Updates to it can be downloaded from the following mirrors:
• edit in README.md at line 80
  [4.674]→[4.20:20](∅→∅),[4.47]→[4.20:20](∅→∅),[4.47]→[3.22:22](∅→∅),[4.47]→[3.22:22](∅→∅)
  −

  −
• resolve order conflict in README.md at line 80
  [4.674]

  [4.1528]
• edit in README.md at line 81
  [4.74]→[3.23:83](∅→∅),[4.74]→[3.23:83](∅→∅),[3.83]→[4.22:22](∅→∅),[4.74]→[4.22:22](∅→∅),[4.101]→[4.22:22](∅→∅),[4.119]→[3.85:85](∅→∅),[4.119]→[3.85:85](∅→∅)
  − * https://git.merveilles.town/akkartik/template-live-editor

  −

  −
• edit in README.md at line 83
  [2.71]

  [4.719]
  + * https://git.merveilles.town/akkartik/carousel.love