Update project.json

2016-10-24 11:24:38 +05:30 · 2016-10-24 11:24:38 +05:30 · 297e725727
commit 297e725727
parent 03a77b1b65
1 changed files with 1 additions and 4 deletions
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@ -1041,11 +1041,8 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 4, 
-<<<<<<< 6ef2c9faa43ba40bef00abc29cd9a5de980b2037
 "modified": "2016-10-21 04:20:14.974653", 
-=======
 "modified": "2016-10-23 01:02:40.632849", 
->>>>>>> [fix] 6363
 "modified_by": "Administrator", 
 "module": "Projects", 
 "name": "Project", 
@ -1101,4 +1098,4 @@
 "sort_order": "DESC", 
 "timeline_field": "customer", 
 "track_seen": 1
-}
+}