fix merging conflicts

5 years ago · b92ad5e9ce
parent 16514a8f10
commit b92ad5e9ce
2 changed files with 2 additions and 2 deletions
--- a/apps/explorer/lib/explorer/chain/pending_block_operation.ex
+++ b/apps/explorer/lib/explorer/chain/pending_block_operation.ex
@ -16,7 +16,7 @@ defmodule Explorer.Chain.PendingBlockOperation do
  @type t :: %__MODULE__{
          block_hash: Hash.Full.t(),
          fetch_internal_transactions: boolean()
-  }
+        }

  @primary_key false
  schema "pending_block_operations" do
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@ -13,7 +13,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
  import Indexer.Block.Fetcher, only: [async_import_coin_balances: 2]

  alias Explorer.Chain
-  alias Explorer.Chain.{Block, Hash}
+  alias Explorer.Chain.Block
  alias Explorer.Chain.Cache.{Accounts, Blocks}
  alias Indexer.{BufferedTask, Tracer}
  alias Indexer.Transform.Addresses