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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-12-13 14:30:32 +05:30
parent 403bab07a0 3bfe01d1e0
commit 201af80706
17 changed files with 209 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/support/doctype/warranty_claim/warranty_claim.json
View File

@@ -1124,7 +1124,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2016-11-07 05:06:08.638760",
"modified": "2016-12-13 11:17:40.538428",
"modified_by": "Administrator",
"module": "Support",
"name": "Warranty Claim",