From 43d75b96c6fe25a51ac49e3c30681d62157a0b7a Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 7 Feb 2025 13:18:42 +0530 Subject: [PATCH] chore: resolve conflict --- .../test_tax_withholding_category.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py index 4f527868722..6ab6bcc08a2 100644 --- a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py +++ b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py @@ -6,13 +6,8 @@ import unittest import frappe from frappe.custom.doctype.custom_field.custom_field import create_custom_fields -<<<<<<< HEAD from frappe.tests.utils import FrappeTestCase, change_settings -from frappe.utils import add_days, today -======= -from frappe.tests import IntegrationTestCase, UnitTestCase from frappe.utils import add_days, add_months, today ->>>>>>> 0cdd346f8f (test: ldc @ 0 rate) from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry from erpnext.accounts.utils import get_fiscal_year