Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Sep 30, 2025

task-4921798

Forward-Port-Of: #14518

@robodoo
Copy link
Collaborator

robodoo commented Sep 30, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 30, 2025

@emmi-odoo @auva-odoo cherrypicking of pull request #14518 failed.

stdout:

Auto-merging content/applications/sales/point_of_sale/payment_methods/terminals.rst
CONFLICT (content): Merge conflict in content/applications/sales/point_of_sale/payment_methods/terminals.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

@emmi-odoo emmi-odoo force-pushed the 19.0-18.0-pos-pine-emmi-466630-fw branch from b2967fa to 961d874 Compare September 30, 2025 10:59
@C3POdoo C3POdoo requested a review from a team September 30, 2025 11:00
@emmi-odoo emmi-odoo force-pushed the 19.0-18.0-pos-pine-emmi-466630-fw branch from 961d874 to f0a12fb Compare September 30, 2025 11:02
@emmi-odoo
Copy link
Contributor

@robodoo r+

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