From b92ad5e9ce6de1f51b8da4c39c8c78cc46cd989a Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 28 Nov 2019 16:32:19 +0300 Subject: [PATCH] fix merging conflicts --- apps/explorer/lib/explorer/chain/pending_block_operation.ex | 2 +- apps/indexer/lib/indexer/fetcher/internal_transaction.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/explorer/lib/explorer/chain/pending_block_operation.ex b/apps/explorer/lib/explorer/chain/pending_block_operation.ex index df849ebe37..d85cc589b0 100644 --- 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 diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex index ea907129b1..ea7fda1397 100644 --- 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