mirror of https://github.com/poanetwork/quorum.git
fix merge conflict
This commit is contained in:
parent
c2b98220eb
commit
5f7042a383
|
@ -11,13 +11,6 @@ import (
|
||||||
//nolint:varcheck
|
//nolint:varcheck
|
||||||
var hasBMI2 = cpu.X86.HasBMI2
|
var hasBMI2 = cpu.X86.HasBMI2
|
||||||
|
|
||||||
import (
|
|
||||||
"golang.org/x/sys/cpu"
|
|
||||||
)
|
|
||||||
|
|
||||||
//nolint:varcheck
|
|
||||||
var hasBMI2 = cpu.X86.HasBMI2
|
|
||||||
|
|
||||||
// go:noescape
|
// go:noescape
|
||||||
func gfpNeg(c, a *gfP)
|
func gfpNeg(c, a *gfP)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue