nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-15 12:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-06 12:12:59 +05:30
committed by GitHub
parent 740dd878e9
commit 292f17b1b0
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -1671,11 +1671,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2025-07-28 12:14:29.760988",
=======
"modified": "2026-02-06 11:06:16.092658",
>>>>>>> 1a22e3cb61 (fix: enabling skip delivery option for order type maintenance)
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",