From 395508c68d9109e3afd38920380cf57b3e00bee5 Mon Sep 17 00:00:00 2001 From: zhangmenghang Date: Thu, 12 Oct 2023 14:59:41 +0800 Subject: [PATCH] fix conflict --- contracts/native/governance/node_manager/manager_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contracts/native/governance/node_manager/manager_test.go b/contracts/native/governance/node_manager/manager_test.go index 26aa4101..c7b766e6 100644 --- a/contracts/native/governance/node_manager/manager_test.go +++ b/contracts/native/governance/node_manager/manager_test.go @@ -24,12 +24,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/contracts/native/contract" - "github.com/ethereum/go-ethereum/contracts/native/governance/community" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/contracts/native" + "github.com/ethereum/go-ethereum/contracts/native/contract" . "github.com/ethereum/go-ethereum/contracts/native/go_abi/node_manager_abi" + "github.com/ethereum/go-ethereum/contracts/native/governance/community" "github.com/ethereum/go-ethereum/contracts/native/utils" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/crypto"