resolve conflicts

akkartik

Mar 11, 2024, 4:41 AM

JX3PYEISFO52YADPBWHVUDGYQXGNWA6X57KYYQWKZRXQ2L243N2AC

Dependencies

• [2] ADBLR7B4 new mirror
• [3] HCJNNXOU resolve conflicts
• [4] 3CZ635HD best prose across forks
• [5] D4FEFHQC flesh out Readme
• [6] U6JNZOH4 Merge text0
• [7] BPYWIU62 new fork: template for live programming with editor widgets
• [8] TC47I2JR Merge lines.love
• [9] L5SYYGSB new mirror; also correct a typo
• [10] OIKT7FME Merge lines.love
• [11] HOQCFQBM cleaner
• [12] OJ2CLK4Q Merge text0
• [13] MD3W5IRA new fork: rip out drawing support
• [*] FS2ITYYH record a known issue

Change contents

• edit in README.md at line 78
  [4.47]→[4.20:20](∅→∅),[4.12276]→[3.37:37](∅→∅),[4.12276]→[3.37:37](∅→∅)
  −

  −
• resolve order conflict in README.md at line 78
  [4.47]

  [4.1528]
• edit in README.md at line 81
  [2.74]

  [4.22]
  + * https://git.merveilles.town/akkartik/template-live-editor
• edit in README.md at line 83
  [4.12445]→[3.38:87](∅→∅),[4.12445]→[3.38:87](∅→∅)
  − * https://git.merveilles.town/akkartik/text.love
• resolve order conflict in README.md at line 83
  [4.119]

  [4.1609]