Skip to content

Commit

Permalink
merge conflcit
Browse files Browse the repository at this point in the history
  • Loading branch information
cyberhorsey committed Jan 4, 2023
2 parents b417e6e + 10176db commit 0c4e167
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions packages/website/docs/smart-contracts/L1/TaikoL1.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,6 @@ function signWithGoldenTouch(bytes32 hash, uint8 k) public view returns (uint8 v
function getBlockProvers(uint256 id, bytes32 parentHash) public view returns (address[])
```

### getUncleProofDelay

```solidity
function getUncleProofDelay(uint256 blockId) public view returns (uint64)
```

### getConfig

```solidity
Expand Down

0 comments on commit 0c4e167

Please sign in to comment.