Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 9, 2025

task-5094826

Forward-Port-Of: #14810

needs to be kept as is for the moment, cf #14466

@robodoo
Copy link
Collaborator

robodoo commented Oct 9, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 9, 2025

@auva-odoo cherrypicking of pull request #14810 failed.

stdout:

Auto-merging content/applications/general/iot/windows_iot.rst
CONFLICT (content): Merge conflict in content/applications/general/iot/windows_iot.rst

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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@auva-odoo auva-odoo force-pushed the saas-18.4-17.0-virtual-iot-download-auva-469055-fw branch from bd65a84 to 4f68864 Compare October 9, 2025 10:51
@C3POdoo C3POdoo requested a review from a team October 9, 2025 10:53
@auva-odoo auva-odoo force-pushed the saas-18.4-17.0-virtual-iot-download-auva-469055-fw branch from 4f68864 to ada2de3 Compare October 9, 2025 11:48
@auva-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Oct 9, 2025
task-5094826

closes #14821

Signed-off-by: Audrey Vandromme (auva) <[email protected]>
robodoo pushed a commit that referenced this pull request Oct 10, 2025
task-5094826

closes #14821

Signed-off-by: Audrey Vandromme (auva) <[email protected]>
@robodoo robodoo closed this Oct 10, 2025
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.

3 participants