Solving a conflict

pmeunier

Feb 7, 2024, 4:28 PM

NABOB7CQIQNLFXHPR2LMOHTQLYXRB7WCBTF2CZQZURSS4E4SWV5QC

Dependencies

• [2] WQ2GJPJW Make tests compile
• [3] QWIYNMI5 Formatting + big-endian Sanakirja
• [4] DVBSW7SI Bump dependencies with minor-level changes
• [5] A3RM526Y Integrating identity malleability
• [6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• resolve order conflict in pijul/Cargo.toml at line 82
  [3.2403]

  [4.164]
• edit in pijul/Cargo.toml at line 83
  [4.182]→[4.182:264](∅→∅)
  − sanakirja = { version = "1.3", default-features = false, features = [ "crc32" ] }
• resolve order conflict in pijul/Cargo.toml at line 117
  [4.635]

  [2.903]