Fix merge conflicts

This commit is contained in:
chriseth
2020-11-24 16:36:55 +01:00
parent 253889cbf1
commit e880219649
4 changed files with 113 additions and 39 deletions
@@ -11,3 +11,4 @@ contract C {
}
// ----
// Warning 6328: (163-180): CHC: Assertion violation might happen here.
// Warning 7812: (163-180): BMC: Assertion violation might happen here.