Skip to content
GitLab
Commit b0ff7ee6 authored by Arnaud Fontaine's avatar Arnaud Fontaine
Browse files

Fix conflicts between 2a188797 and df04eb69. 

* 2a188797: "simulation: improve equivalence testers explanations messages"
* df04eb69: "Implement delivery.getQuantity() == 0."
parent 50b6baf3
Show whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7