cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chriseth
2020-03-24 13:35:41 +01:00
parent 9d92c9fbf1 d584b2d1aa
commit 7d68f9f6c3
856 changed files with 12967 additions and 8148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/contracts/interfaces.rst
+2 -2
View File
@@ -22,7 +22,7 @@ Interfaces are denoted by their own keyword:
::
pragma solidity >=0.5.0 <0.8.0;
pragma solidity >=0.6.2 <0.8.0;
interface Token {
enum TokenType { Fungible, NonFungible }
@@ -42,7 +42,7 @@ inheritance.
::
pragma solidity >0.6.1 <0.8.0;
pragma solidity >=0.6.2 <0.8.0;
interface ParentA {
function test() external returns (uint256);