From f273bb9f729e0e56f9fb249fd9837b0190415b98 Mon Sep 17 00:00:00 2001 From: "vracek@protonmail.com" Date: Fri, 11 Oct 2019 16:43:54 -0600 Subject: [PATCH] jsonrpc: update imports --- internal/rpc/jsonrpc/methods.go | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/internal/rpc/jsonrpc/methods.go b/internal/rpc/jsonrpc/methods.go index e2709ff7e..4eeb7e545 100644 --- a/internal/rpc/jsonrpc/methods.go +++ b/internal/rpc/jsonrpc/methods.go @@ -12,33 +12,15 @@ import ( "encoding/binary" "encoding/hex" "encoding/json" -<<<<<<< HEAD - "hash" - "io/ioutil" "math/big" "sort" "strconv" "strings" -======= ->>>>>>> update "sync" "time" -<<<<<<< HEAD:internal/rpc/jsonrpc/methods.go "github.com/decred/dcrd/blockchain/stake/v2" blockchain "github.com/decred/dcrd/blockchain/standalone" -======= -<<<<<<< HEAD -<<<<<<< HEAD - "github.com/decred/dcrd/blockchain" -======= - "github.com/decred/base58" ->>>>>>> legacyrpc: add paytocontracthashaddress rpc method -======= ->>>>>>> update - "github.com/decred/dcrd/blockchain/stake" - "github.com/decred/dcrd/chaincfg" ->>>>>>> legacyrpc: add getContractHash method:rpc/legacyrpc/methods.go "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v2" "github.com/decred/dcrd/dcrec"