mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-04 05:58:27 +00:00
chore: resolve conflicts with backport
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
|
||||
# For license information, please see license.txt
|
||||
|
||||
import json
|
||||
|
||||
Reference in New Issue
Block a user