Solving a conflict

Dependencies

• [2] IXWN5CYP pijul: enable colored help messages
• [3] L4JXJHWX pijul/*: reorganize imports and remove extern crate
• [4] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• edit in pijul/src/main.rs at line 0
  [4.84162]→[2.0:23](∅→∅)
  − use clap::AppSettings;
• edit in pijul/src/main.rs at line 0
  [4.84162]→[2.0:23](∅→∅)
  − use clap::AppSettings;