pijul nest
guest › [sign in] [explore]

resolve conflicts

akkartik
Sep 5, 2024, 8:54 PM
QKFHDM6JBO7SLLY4QNZO4KCLXAG2YS2H7L5PBYTDMPACNNWYG4QAC

Dependencies

  • [2] OJ2CLK4Q Merge text0
  • [3] UOGZZY3L link to reference from Readme
  • [4] KSL52BPS link to Freewheeling Apps page
  • [5] 3WSB7ZTV resolve conflicts
  • [6] ZTMRQZSW Readme
  • [7] 2DVVKKVA flesh out Readme
  • [8] MD3W5IRA new fork: rip out drawing support
  • [9] BPYWIU62 new fork: template for live programming with editor widgets
  • [10] EZHO4TSW new file-system format for freewheeling apps
  • [11] AMYOQ4QW fine, I'll add a badge
  • [12] D4FEFHQC flesh out Readme
  • [13] HUDGLWXF include instructions to install LÖVE
  • [*] FS2ITYYH record a known issue

Change contents

  • resurrect zombie in README.md at line 3
    [6.11635]→[6.813093:813167](∅→∅),[6.11635]→[6.813093:813167](∅→∅)
    Running this repo in isolation won't be very helpful. If you haven't yet,
  • edit in README.md at line 3
    [6.11635]
    [6.813093]
    [![0 dependencies!](https://0dependencies.dev/0dependencies.svg)](https://0dependencies.dev)
  • resurrect zombie in README.md at line 7
    [2.94]→[6.813244:813454](∅→∅),[6.813244]→[6.813244:813454](∅→∅),[6.813244]→[6.813244:813454](∅→∅),[6.813454]→[3.18:96](∅→∅),[6.813454]→[3.18:96](∅→∅)
    This repo is a template you can copy to create your own live apps that juggle
    text editor widgets. The editors support copy/paste, search, infinite undo,
    etc. You can't modify editor functionality live (yet?).
    [Some reference documentation on how to create your own apps.](reference.md)
  • edit in README.md at line 12
    [6.11635]→[5.36:130](∅→∅),[6.11635]→[5.36:130](∅→∅),[6.11832]→[5.132:132](∅→∅),[6.11832]→[5.132:132](∅→∅)
    [![0 dependencies!](https://0dependencies.dev/0dependencies.svg)](https://0dependencies.dev)
  • resolve order conflict in README.md at line 12
    [3.96]
    [6.36]
  • resurrect zombie in README.md at line 13
    [6.19]→[4.19:175](∅→∅),[6.19]→[4.19:175](∅→∅)
    This repo is an example of a [Freewheeling App](http://akkartik.name/freewheeling),
    designed above all to be easy to run, easy to modify and easy to share.