Fix merge conflicts.

This commit is contained in:
chriseth
2020-07-21 15:06:57 +02:00
parent 50c3daf693
commit 8b7567f963
3 changed files with 6 additions and 52 deletions
@@ -3,4 +3,4 @@ contract C {
function iHaveAuthor() public pure {}
}
// ----
// Warning 9843: (17-35): Documentation tag @author is only allowed on contract definitions. It will be disallowed in 0.7.0.
// DocstringParsingError 6546: (17-35): Documentation tag @author not valid for functions.