Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update project.json

Browse Source
This commit is contained in:
Pawan Mehta 2016-10-24 11:24:38 +05:30 committed by GitHub
parent 03a77b1b65
commit 297e725727
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/projects/doctype/project/project.json
View File

@ -1041,11 +1041,8 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 4, "max_attachments": 4,
<<<<<<< 6ef2c9faa43ba40bef00abc29cd9a5de980b2037
"modified": "2016-10-21 04:20:14.974653", "modified": "2016-10-21 04:20:14.974653",
=======
"modified": "2016-10-23 01:02:40.632849", "modified": "2016-10-23 01:02:40.632849",
>>>>>>> [fix] 6363
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Project", "name": "Project",
@ -1101,4 +1098,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"timeline_field": "customer", "timeline_field": "customer",
"track_seen": 1 "track_seen": 1
} }