From f07267b4e38470449060d0341f4c72a55210adf4 Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Tue, 23 Aug 2022 13:25:40 +0300 Subject: [PATCH] Resolve rebase conflicts --- .github/workflows/config.yml | 2 +- apps/explorer/lib/explorer/account/tag_transaction.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index c87ed7e041..b8cda73ef4 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -4,7 +4,7 @@ on: push: branches: - account - - np-separate-account-separate-db + - np-separate-account-encrypt-db-1 env: MIX_ENV: test diff --git a/apps/explorer/lib/explorer/account/tag_transaction.ex b/apps/explorer/lib/explorer/account/tag_transaction.ex index 34ea5335d7..559090fd12 100644 --- a/apps/explorer/lib/explorer/account/tag_transaction.ex +++ b/apps/explorer/lib/explorer/account/tag_transaction.ex @@ -121,7 +121,7 @@ defmodule Explorer.Account.TagTransaction do |> Repo.account_repo().one() end - def get_tag transaction_by_transaction_hash_and_identity_id(_, _), do: nil + def get_tag_transaction_by_transaction_hash_and_identity_id(_, _), do: nil def tag_transaction_by_id_and_identity_id_query(tag_id, identity_id) when not is_nil(tag_id) and not is_nil(identity_id) do