pijul_org / pijul

Fix conflicts

By FlorentBecker on April 8, 2018
This patch is not signed.
7EviJSLKTLcd8sCwEPA5Qh6XL7ZvGYuzVRQ2J2FxVDWSt5Vjs6uBeM1pqDpynPtceVBUvKgXnTWPnVXeaKP7HLbF
This patch is in the following branches:
latest
master
testing
In file pijul/src/commands