resolve conflicts

akkartik

Mar 11, 2024, 3:33 AM

2P33TFJSZWTPZIPSI5DHZLPF7C7HD2TPKLITFWSLHKJECCQHN6MAC

Dependencies

• [2] HDKMYZKA new mirror
• [3] OPFXDG3U add a mirror and reorg mirrors
• [4] JSJ7J5WE Merge lines.love
• [5] 6YWPSNUK new mirror
• [6] D4FEFHQC flesh out Readme
• [7] ZLEPKWDJ fork: capture frontend for a note-taking system
• [8] XKE4KC65 Merge upstream
• [9] KMFEUG3I best prose across forks
• [*] FS2ITYYH record a known issue

Change contents

• edit in README.md at line 89
  [4.218]→[4.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](∅→∅),[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 89
  [4.218]

  [4.1528]
• edit in README.md at line 92
  [2.81]

  [4.38]
  + * https://git.merveilles.town/akkartik/capture.love