From aec1916a0f87255367db61797a5b2700b6a4f09a Mon Sep 17 00:00:00 2001 From: Marica Date: Thu, 10 Mar 2022 14:49:05 +0530 Subject: [PATCH] fix: Merge Conflicts in test_shopping_cart imports --- erpnext/e_commerce/shopping_cart/test_shopping_cart.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/erpnext/e_commerce/shopping_cart/test_shopping_cart.py b/erpnext/e_commerce/shopping_cart/test_shopping_cart.py index bdbdaa0e45a..72d6962708d 100644 --- a/erpnext/e_commerce/shopping_cart/test_shopping_cart.py +++ b/erpnext/e_commerce/shopping_cart/test_shopping_cart.py @@ -5,12 +5,9 @@ import unittest import frappe -<<<<<<< HEAD -from frappe.utils import add_months, nowdate -======= from frappe.tests.utils import change_settings from frappe.utils import add_months, cint, nowdate ->>>>>>> a13e06156b (fix: 'save_quotations_as_draft' checkbox not honoured) + from erpnext.accounts.doctype.tax_rule.tax_rule import ConflictingTaxRule from erpnext.e_commerce.doctype.website_item.website_item import make_website_item