Skip to content

[IMP] website: update header/footer page#18951

Open
fw-bot wants to merge 1 commit into
saas-19.3from
saas-19.3-19.0-website-header-footer-lman-547644-fw
Open

[IMP] website: update header/footer page#18951
fw-bot wants to merge 1 commit into
saas-19.3from
saas-19.3-19.0-website-header-footer-lman-547644-fw

Conversation

@fw-bot

@fw-bot fw-bot commented Jul 16, 2026

Copy link
Copy Markdown
Collaborator

task-6260356

Forward-Port-Of: #18919
Forward-Port-Of: #18591

task-6260356

X-original-commit: add75ae
@robodoo

robodoo commented Jul 16, 2026

Copy link
Copy Markdown
Collaborator

Pull request status dashboard

@fw-bot

fw-bot commented Jul 16, 2026

Copy link
Copy Markdown
Collaborator Author

@lman-odoo cherrypicking of pull request #18591 failed.

stdout:

Auto-merging content/applications/websites/ecommerce/checkout.rst
Auto-merging content/applications/websites/website/website_creation.rst
CONFLICT (content): Merge conflict in content/applications/websites/website/website_creation.rst

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

:shipit: you can use git-fw to re-do the forward-port for you locally.

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

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

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