Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Aug 22, 2025

task-4893658

Forward-Port-Of: #14048

@robodoo
Copy link
Collaborator

robodoo commented Aug 22, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 22, 2025

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

stdout:

CONFLICT (modify/delete): content/applications/sales/point_of_sale/restaurant/floors_tables.rst deleted in 049474a9e54f615312a9042d06343dfa54e40c86 and modified in 69015d6f3a83c1136eaf148240e09bae532b80b2.  Version 69015d6f3a83c1136eaf148240e09bae532b80b2 of content/applications/sales/point_of_sale/restaurant/floors_tables.rst left in tree.

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 saas-18.2-18.0-pos-restaurant-emmi-450564-fw branch from 2a05318 to a8355b0 Compare August 26, 2025 11:36
@C3POdoo C3POdoo requested review from a team August 26, 2025 11:56
@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.

3 participants