commit 46ead70be8d751cea4ff0aa82a232648c4b50d42
author pawan <pawan@erpnext.com> Sun Oct 23 10:51:47 2016 +0530
committer pawan <pawan@erpnext.com> Mon Oct 24 11:18:29 2016 +0530
tree 8dd87cc597875852ecde8d9af8366a4951a27dd2
parent 9a43a2a97be76204af03db54fc6b7198d2a8aa9a

[fix] fixes_6363

erpnext/projects/doctype/project/project.json

diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 465deae..6ce525b 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -270,7 +270,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "% Tasks Completed", 
+   "label": "% Completed", 
    "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
@@ -1041,7 +1041,11 @@
  "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",