Fixed merge conflict

This commit is contained in:
Nabin Hait
2018-02-03 09:14:53 +05:30
20 changed files with 210 additions and 38 deletions

View File

@@ -15,7 +15,7 @@ def get_data():
{
"type": "doctype",
"name": "Task",
"route": "Tree/Task",
"route": "List/Task",
"description": _("Project activity / task."),
},
{