fixed conflicts

This commit is contained in:
Rohit Waghchaure
2019-10-15 14:18:59 +05:30
parent cf24191fe5
commit 66072fec5a
6 changed files with 540 additions and 2593 deletions

View File

@@ -846,7 +846,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2019-03-21 16:26:45.447265",
"modified": "2019-10-14 16:26:45.447265",
"modified_by": "Administrator",
"module": "Setup",
"name": "Sales Partner",