Conflict resolution

[?]
Dec 7, 2020, 3:54 PM
QAPSKSFCALRNAAC52S4N7BSCLTFL2UMSNFVXRA447M2VMXE4KVLQC

Dependencies

  • [2] VO5OQW4W Removing anyhow in libpijul
  • [3] HMMMKONL Fixing alive vertices
  • [4] 7FFFKQZU add 'Default' implementations
  • [5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

  • resurrect zombie in "libpijul/src/missing_context.rs" at line 323
    [5.706721][4.602:621](),[5.706721][4.602:621]()
    #[derive(Default)]
  • resurrect zombie in "libpijul/src/apply.rs" at line 544
    [5.961172][4.674:693](),[5.961172][4.674:693]()
    #[derive(Default)]