More conflict resolution

[?]
Jan 4, 2021, 10:37 AM
CT2NMBSCAHL6JY56GIDFON4J5DMWUSAVF33DQ6QRTEJIFZWJPJ3QC

Dependencies

  • [2] AVKEKHJX Solving a conflict
  • [3] XDGLFBST version 1.0.0-alpha.24
  • [4] JHJB5ZQX Removing conflict markers
  • [5] SCSV2FNS Reboot
  • [6] BRV6TU4B Turning the Installation page more beginner-friendly
  • [7] LLS53CR2 Add installation instructions for openSUSE Tumbleweed
  • [8] GLUD3ZVF Generating the reference
  • [9] ONXLUQLI Add install instructions for arch

Change contents

  • edit in src/installing.md at line 44
    [5.138][3.0:0](),[5.138][3.0:0]()
  • resurrect zombie in "src/installing.md" at line 45
    [5.1372][5.120:121](),[5.120][5.120:121](),[5.120][5.120:121]()
  • resurrect zombie in "src/installing.md" at line 47
    [5.1464][5.151:152](),[5.151][5.151:152](),[5.151][5.151:152]()
  • edit in src/installing.md at line 98
    [5.255][4.0:1](),[5.255][4.0:1]()
  • resurrect zombie in "src/installing.md" at line 98
    [5.255][5.308895:308896](),[5.1771][5.308895:308896](),[5.506][5.308895:308896](),[5.308895][5.308895:308896](),[5.255][5.308895:308896]()
  • resurrect zombie in "src/installing.md" at line 115
    [5.838][5.308896:309070](),[5.308896][5.308896:309070](),[5.308896][5.308896:309070]()
    ### Windows
    We do not provide Windows binaries at the moment, but we would like to.
    If you want to help us do that, please [contact us](https://nest.pijul.com/pijul/pijul).