Closed fw-bot closed 2 months ago
@LucasLefevre @rrahir cherrypicking of pull request odoo/o-spreadsheet#4751 failed.
stdout:
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).
In the former case, you may want to edit this PR message as well.
:warning: after resolving this conflict, you will need to merge it via @robodoo.
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
Task: 0
Description:
description of this task, what is implemented and why it is implemented that way.
Task: : TASK_ID
review checklist
Forward-Port-Of: odoo/o-spreadsheet#4755 Forward-Port-Of: odoo/o-spreadsheet#4751