resolve conflict

This commit is contained in:
sonal arora
2020-09-28 00:30:29 +05:30
37 changed files with 19 additions and 19 deletions

View File

@@ -86,4 +86,4 @@ class Project(models.Model):
class ProjectTaskType(models.Model):
_inherit = 'project.task.type'
all_project_check = fields.Boolean(string='Show All Project', default=False, copy=False)
all_project_check = fields.Boolean(string='Show All Project', default=False, copy=False)