Update crypto/keys/secp256r1/pubkey.go

cosmos · Apr 13, 2024 · 3022772 · 3022772
1 parent 5dc4cd7
commit 3022772
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/crypto/keys/secp256r1/pubkey.go b/crypto/keys/secp256r1/pubkey.go
@@ -1,13 +1,9 @@
 package secp256r1
 
 import (
-<<<<<<< HEAD
-	tmcrypto "github.com/cometbft/cometbft/crypto"
-=======
 	"encoding/base64"
 
-	cmtcrypto "github.com/cometbft/cometbft/crypto"
->>>>>>> 037cf98f7 (fix: Implement gogoproto customtype to secp256r1 keys (#20027))
+	tmcrypto "github.com/cometbft/cometbft/crypto"
 	"github.com/cosmos/gogoproto/proto"
 
 	ecdsa "github.com/cosmos/cosmos-sdk/crypto/keys/internal/ecdsa"