fix left over conflicts

Dependencies

• [2] Q3GU26WD merge with changes from sanakirja v1.1.2
• [3] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [4] NYOF5766 track file encoding in the record, including change text for file adds
• [5] EQLDTLXV Fixing a bug with empty new files, and another one with empty replacements
• [*] VO5OQW4W Removing anyhow in libpijul
• [*] YN63NUZO Sanakirja 1.0
• [*] UM5DLRPB store new non-UTF-8 files raw and decode to deplay the contents
• [*] JRENVH5D Reqwest 0.11
• [*] 6HNRL5RT detect non-utf8 text files

Change contents

• resolve order conflict in libpijul/src/record.rs at line 281
  [3.29]

  [3.2232]
• resurrect zombie in "libpijul/src/record.rs" at line 291
  [2.996]→[3.2625:2853](∅→∅),[3.2625]→[3.2625:2853](∅→∅),[3.2625]→[3.2625:2853](∅→∅)
  + inode: Position {

  + change: None,

  + pos: inode_pos,

  + },

  + })),

  + encoding,

  + )
• resolve order conflict in libpijul/src/change/text_changes.rs at line 1245
  [8.143228]

  [9.592]
• resolve order conflict in libpijul/Cargo.toml at line 116
  [10.730]

  [11.5871]