Skip to content

Conversation

@fw-bot
Copy link

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

See odoo/odoo#104836

task-2963840

Forward-Port-Of: #629

*: theme_anelusia, theme_artists, theme_avantgarde,
   theme_aviato, theme_beauty, theme_bewise, theme_bistro,
   theme_bookstore, theme_buzzy, theme_clean, theme_cobalt,
   theme_enark, theme_graphene, theme_kea, theme_kiddo,
   theme_loftspace, theme_monglia, theme_nano, theme_notes,
   theme_odoo_experts, theme_orchid, theme_paptic,
   theme_real_estate, theme_test_custo, theme_treehouse,
   theme_vehicle, theme_yes, theme_zap

See community commit for details.

task-2963840

X-original-commit: e46be95
Co-authored-by: qsm-odoo <[email protected]>
@robodoo
Copy link
Collaborator

robodoo commented Oct 24, 2025

Pull request status dashboard

@fw-bot
Copy link
Author

fw-bot commented Oct 24, 2025

@bso-odoo @qsm-odoo cherrypicking of pull request #629 failed.

stdout:

Auto-merging theme_orchid/data/ir_asset.xml
CONFLICT (content): Merge conflict in theme_orchid/data/ir_asset.xml

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

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