mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-20 02:42:27 +00:00
fix conflicts
This commit is contained in:
parent
f8319151a4
commit
8eff8952ac
2 changed files with 4 additions and 1 deletions
|
|
@ -2,6 +2,9 @@ package vm
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/holiman/uint256"
|
||||
|
||||
"math/big"
|
||||
"time"
|
||||
|
||||
|
|
@ -9,7 +12,6 @@ import (
|
|||
"github.com/ethereum/go-ethereum/common/hexutil"
|
||||
"github.com/ethereum/go-ethereum/log"
|
||||
"github.com/ethereum/go-ethereum/params"
|
||||
"github.com/holiman/uint256"
|
||||
)
|
||||
|
||||
// Wrapper type which allows PrecompiledContract to be used as PrecompiledContractWithCtx
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ package bls
|
|||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
|
||||
"math/big"
|
||||
"time"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue