Manual for Pijul

More conflict resolution

Created by  pmeunier  on January 4, 2021
CT2NMBSCAHL6JY56GIDFON4J5DMWUSAVF33DQ6QRTEJIFZWJPJ3QC
Change contents