oknozor/pijul - Change QAPSKSFCALRNAAC52S4N7BSCLTFL2UMSNFVXRA447M2VMXE4KVLQC

Conflict resolution

Created by pmeunier on December 7, 2020

QAPSKSFCALRNAAC52S4N7BSCLTFL2UMSNFVXRA447M2VMXE4KVLQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in "libpijul/src/missing_context.rs" at line 323 [5.696460]
B:B[5.706721] → [4.602:621]
BD:B[5.706721] → [4.602:621]
```
#[derive(Default)]
```
Resurrecting zombie bytes in "libpijul/src/apply.rs" at line 544 [5.944089]
B:B[5.961172] → [4.674:693]
BD:B[5.961172] → [4.674:693]
```
#[derive(Default)]
```