mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Fix merge conflicts.
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user