From 357697702be3126b6508e6755d67ac4aa58f668b Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 1 Nov 2023 14:11:36 +0530 Subject: [PATCH] chore: resolve conflicts --- .../doctype/plaid_settings/plaid_settings.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py index d37868ab681..a462141a86b 100644 --- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py +++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py @@ -238,11 +238,6 @@ def new_bank_transaction(transaction): deposit = abs(amount) withdrawal = 0.0 -<<<<<<< HEAD - status = "Pending" if transaction["pending"] == "True" else "Settled" - -======= ->>>>>>> 46ea868559 (fix(plaid): Do not sync pending transactions) tags = [] try: tags += transaction["category"]