resolve conflicts

akkartik

Mar 11, 2024, 4:36 AM

HCJNNXOUWLPXGJHGRGOZN7AV5QJLR6QYSLZNDYUW7D73OUUXQN3QC

Dependencies

• [2] TC47I2JR Merge lines.love
• [3] OPFXDG3U add a mirror and reorg mirrors
• [4] D4FEFHQC flesh out Readme
• [5] 6YWPSNUK new mirror
• [6] HOQCFQBM cleaner
• [7] MD3W5IRA new fork: rip out drawing support
• [8] 3CZ635HD best prose across forks
• [9] OIKT7FME Merge lines.love
• [*] FS2ITYYH record a known issue

Change contents

• edit in README.md at line 65
  [4.12276]→[2.37:37](∅→∅),[4.1243]→[3.36:77](∅→∅),[4.1243]→[3.36:77](∅→∅),[4.1406]→[3.78:128](∅→∅),[4.1406]→[3.78:128](∅→∅),[4.1456]→[3.129:213](∅→∅),[4.1456]→[3.129:213](∅→∅)
  −

  − * https://git.sr.ht/~akkartik/lines.love

  − * https://git.merveilles.town/akkartik/lines.love

  − * https://codeberg.org/akkartik/lines.love

  − * https://github.com/akkartik/lines.love
• resolve order conflict in README.md at line 65
  [4.12276]

  [4.1528]
• edit in README.md at line 69
  [4.12445]

  [4.12445]
  + * https://git.merveilles.town/akkartik/text.love