From 01e9a8ecd1150ef06127ffdbbfa370f430017fbe Mon Sep 17 00:00:00 2001 From: Carlos Quintero Date: Thu, 20 Apr 2023 17:04:39 -0500 Subject: [PATCH] add adminJs renaming to branch, fix merge conflicts --- src/server/adminJs/tabs/donationTab.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/server/adminJs/tabs/donationTab.ts b/src/server/adminJs/tabs/donationTab.ts index 73cffec1b..3fc280503 100644 --- a/src/server/adminJs/tabs/donationTab.ts +++ b/src/server/adminJs/tabs/donationTab.ts @@ -24,7 +24,10 @@ import { getCsvAirdropTransactions, getGnosisSafeTransactions, } from '../../../services/transactionService'; -import { i18n, translationErrorMessagesKeys } from '../../../utils/errorMessages'; +import { + i18n, + translationErrorMessagesKeys, +} from '../../../utils/errorMessages'; import { Project } from '../../../entities/project'; import { calculateGivbackFactor } from '../../../services/givbackService'; import { findUserByWalletAddress } from '../../../repositories/userRepository';