Merge remote-tracking branch 'origin/develop' into breaking

This commit is contained in:
chriseth
2020-12-16 16:56:45 +01:00
8 changed files with 81 additions and 23 deletions
@@ -1,10 +1,10 @@
contract TimelockUpgrade {
function confirmUpgrade() external {
uint256 m;
uint256 d;
(/*year*/,/*month*/,d/*yad*/,m/*hour*/,/*minute*/,/*second*/) = BokkyDateTime.timestampToDateTime(block.timestamp);
}
}
contract TimelockUpgrade {
function confirmUpgrade() external {
uint256 m;
uint256 d;
(/*year*/,/*month*/,d/*yad*/,m/*hour*/,/*minute*/,/*second*/) = BokkyDateTime.timestampToDateTime(block.timestamp);
}
}
// ----
// ParserError 8936: (128-139): Mismatching directional override markers in comment or string literal.
// ParserError 8936: (124-135): Mismatching directional override markers in comment or string literal.