Fixing a conflict

Dependencies

• [2] I24UEJQL Various post-fire fixes
• [3] TFPETWTV Add config options for patch message templates
• [*] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• resolve order conflict in pijul/src/config.rs at line 3
  [2.1685]

  [3.0]