From f3650b4f9d0f66eb4445161703ef84d552c35330 Mon Sep 17 00:00:00 2001 From: marination Date: Tue, 12 Oct 2021 20:29:13 +0530 Subject: [PATCH] fix: Merge conflicts with e-commerce --- erpnext/e_commerce/shopping_cart/utils.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/e_commerce/shopping_cart/utils.py b/erpnext/e_commerce/shopping_cart/utils.py index 7665f4b5a9d..0cc0ab7c002 100644 --- a/erpnext/e_commerce/shopping_cart/utils.py +++ b/erpnext/e_commerce/shopping_cart/utils.py @@ -22,15 +22,11 @@ def set_cart_count(login_manager): return if show_cart_count(): -<<<<<<< HEAD:erpnext/e_commerce/shopping_cart/utils.py from erpnext.e_commerce.shopping_cart.cart import set_cart_count -======= - from erpnext.shopping_cart.cart import set_cart_count # set_cart_count will try to fetch existing cart quotation # or create one if non existent (and create a customer too) # cart count is calculated from this quotation's items ->>>>>>> d824a90fac (fix: Avoid automatic customer creation on website user login):erpnext/shopping_cart/utils.py set_cart_count() def clear_cart_count(login_manager):