From 6f2a567c956c85ca26713a7cd07a23e547da92fa Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sat, 10 Sep 2022 16:41:39 +0530 Subject: [PATCH] fix: conflict --- .../stock/doctype/purchase_receipt/test_purchase_receipt.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index 89a3b9a313f..ef66f943672 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -9,11 +9,8 @@ from collections import defaultdict import frappe from frappe.tests.utils import FrappeTestCase, change_settings from frappe.utils import add_days, cint, cstr, flt, today -<<<<<<< HEAD from six import iteritems -======= from pypika import functions as fn ->>>>>>> a03b4ce213 (fix: reposting not working for internal transferred purchase receipt) import erpnext from erpnext.accounts.doctype.account.test_account import get_inventory_account