resolve conflicts

akkartik

Mar 11, 2024, 3:19 AM

C6UVPMT2VQXWQRDPYG5XIVDP32P25XK2FFBINZTRFN7YVBXHX4IQC

Dependencies

• [2] TOZSVKRE new mirror
• [3] OPFXDG3U add a mirror and reorg mirrors
• [4] JZKEIKO6 freudian typo
• [5] 4GXVWIRQ Merge upstream
• [6] YIBW3BUG best prose across forks
• [7] ZPR5C5WD Merge lines.love
• [8] NCW64JJD experiment: convert to Pijul
• [9] D4FEFHQC flesh out Readme
• [10] SDVBZT66 tailor some copy to this fork
• [11] 6YWPSNUK new mirror
• [*] FS2ITYYH record a known issue

Change contents

• edit in README.md at line 110
  [4.220]→[4.39:39](∅→∅),[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](∅→∅),[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 110
  [4.220]

  [4.1528]
• edit in README.md at line 111
  [4.1529]→[4.135:190](∅→∅)
  − * https://github.com/akkartik/lines-polygon-experiment
• edit in README.md at line 113
  [2.112]

  [4.40]
  + * https://git.merveilles.town/akkartik/lines-polygon-experiment

  + * https://github.com/akkartik/lines-polygon-experiment