resolve conflicts

akkartik

Dec 20, 2023, 1:48 AM

UR7ADLXK2ZPJJVPA7UTJP2TSI5IAUBJHX5LPW6YWLNIHKUH24NOQC

Dependencies

• [2] 4LW3LB4J Merge text0
• [3] NVTUHXC4 maintain the initial font size in a global
• [4] O5YRFXFU document a missing editor API
• [5] B4H3KLKR Merge text0
• [6] H5UZI3YN editor documentation
• [7] TOKSRJMD show how to load lines in editor
• [8] 3HHPHDOO couple of typos
• [*] N2NUGNN4 include a brief reference enabling many useful apps

Change contents

• edit in reference.md at line 224
  [5.824]→[2.92:165](∅→∅),[5.824]→[2.92:165](∅→∅)
  − * `edit.update(state, dt)` -- call this from `on.update` to periodically
• edit in reference.md at line 246
  [5.1654]→[4.18:92](∅→∅)
  − * `edit.update(state, dt)` -- call this from `App.update` to periodically
• resolve order conflict in reference.md at line 246
  [3.326]
• edit in reference.md at line 246
  [0.9]

  [4.92]
  + * `edit.update(state, dt)` -- call this from `on.update` to periodically
• replacement in reference.md at line 249
  [4.130]→[4.130:206](∅→∅)
  − * `edit.quit(state)` -- call this from `App.quit` to ensure any final edits
  [4.130]

  [4.206]
  + * `edit.quit(state)` -- call this from `on.quit` to ensure any final edits