Fix merge conflicts

This commit is contained in:
chriseth
2020-11-25 08:09:38 +01:00
committed by hrkrshnn
parent 5da6bddccb
commit f01cd3f38f
4 changed files with 112 additions and 41 deletions
@@ -84,7 +84,5 @@ contract InternalCall {
// Warning 2018: (1212-1274): Function state mutability can be restricted to pure
// Warning 2018: (1280-1342): Function state mutability can be restricted to pure
// Warning 4588: (771-814): Assertion checker does not yet implement this type of function call.
// Warning 8364: (825-830): Assertion checker does not yet implement type type(contract super ContractWithFunctionNotCalled2)
// Warning 4588: (771-814): Assertion checker does not yet implement this type of function call.
// Warning 8364: (825-830): Assertion checker does not yet implement type type(contract super ContractWithFunctionNotCalled2)
// Warning 5729: (1403-1408): BMC does not yet implement this type of function call.