> conflicts in the branch. > please resolve it.
Hello sir,
Conflicts are due to the changes in main addons branch(lp:openobject-addons).
Can you please merge main branch to this branch to remove these conflicts.
Thanks, Purnendu Singh
« Back to merge proposal
> conflicts in the branch.
> please resolve it.
Hello sir,
Conflicts are due to the changes in main addons branch(lp:openobject-addons).
Can you please merge main branch to this branch to remove these conflicts.
Thanks,
Purnendu Singh