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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2012-12-19 12:18:15 +05:30
parent 1a6a94b760 bb852e45e9
commit 4ecc785aab
28 changed files with 393 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hr/doctype/leave_application/leave_application.txt
View File

@@ -4,7 +4,7 @@
"docstatus": 0,
"creation": "2012-12-10 10:25:20",
"modified_by": "Administrator",
"modified": "2012-12-18 11:06:53"
"modified": "2012-12-18 11:06:54"
},
{
"is_submittable": 1,