resolve conflicts

akkartik

Jul 23, 2024, 4:40 AM

A32JPBYZRKSCODHPU5MH2FVTNYEPEBI5Q7S2LTBMTSIN4MHBWJ5QC

Dependencies

• [2] QGOPFAWI Merge lines.love
• [3] VLNBAPSD add a fork
• [4] GWY3MDWP clarify that PRs and patches are both welcome
• [5] D4FEFHQC flesh out Readme
• [6] L5RVD6PC Merge lines.love
• [7] IEHG6ORO new fork for #1
• [8] DVRRBRGF Merge lines.love
• [9] ZLEPKWDJ fork: capture frontend for a note-taking system
• [10] D5C2QGQX include a fork
• [11] 4OYTC34A include pensieve.love even though it's in development
• [12] SBS2F7GR link to export tool
• [*] FS2ITYYH record a known issue

Change contents

• edit in README.md at line 101
  [5.2141]→[2.34:34](∅→∅),[5.333]→[3.36:159](∅→∅),[5.333]→[3.36:159](∅→∅)
  −

  − * https://git.sr.ht/~akkartik/lines2.love -- an entirely new implementation of

  − some foundations that seems more elegant.
• resolve order conflict in README.md at line 101
  [5.2141]

  [5.19]
• edit in README.md at line 116
  [5.1673]→[2.36:36](∅→∅),[5.1673]→[2.36:36](∅→∅)
  −