nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-13 22:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Mihir Kandoi
2026-08-09 16:18:49 +05:30
parent 2270b22400
commit 94d1dfdcb4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
View File

@@ -1,12 +1,8 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
# See license.txt
<<<<<<< HEAD
=======
from contextlib import contextmanager
from unittest.mock import patch
>>>>>>> e8a6884d5e (test: doc_update published for reference on Quality Inspection submit)
import frappe
from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import nowdate