CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 08:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
Sagar Sharma
2022-08-19 15:30:50 +05:30
parent 9a29e3c9f2
commit 376293326b
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
View File

@@ -616,11 +616,7 @@
],
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-08-16 09:56:41.199435",
=======
"modified": "2022-08-18 15:48:57.419191",
>>>>>>> 256b4245d5 (chore: add additional-cost table in SCR)
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt",