nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-03-05 13:55:50 +05:30
parent 171df3aba5
commit 36fa6bf15c
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/shipment/shipment.json
View File

@@ -440,11 +440,7 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-11-17 17:23:27.025802",
=======
"modified": "2025-02-20 16:55:20.076418", "modified": "2025-02-20 16:55:20.076418",
>>>>>>> 1ec182430d (feat: add total weight in shipment (#46049))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Shipment", "name": "Shipment",