Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 5, 2021

Forward-Port-Of: #1157

@robodoo
Copy link
Collaborator

robodoo commented Oct 5, 2021

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 5, 2021

Ping @AntoineVDV cherrypicking of pull request #1157 failed.

stderr:

16:33:58.187814 git.c:344               trace: built-in: git cherry-pick c95253d440c964e8a5a6a595f3c831131bcc3e47
error: could not apply c95253d4... [REL] supported_versions: update list of versions and add end of support
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

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.

@AntoineVDV AntoineVDV force-pushed the 14.0-13.0-update_supported_versions-anv-fms7-fw branch from 4946471 to 11d3894 Compare October 5, 2021 14:41
@AntoineVDV
Copy link
Collaborator

@robodoo r+

robodoo pushed a commit that referenced this pull request Oct 5, 2021
closes #1161

X-original-commit: a9e2181
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
@robodoo robodoo closed this Oct 5, 2021
@robodoo robodoo temporarily deployed to merge October 5, 2021 14:57 Inactive
@fw-bot fw-bot deleted the 14.0-13.0-update_supported_versions-anv-fms7-fw branch October 19, 2021 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants