Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jan 21, 2026

@robodoo
Copy link
Collaborator

robodoo commented Jan 21, 2026

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 21, 2026

@nikibrown cherrypicking of pull request #16014 failed.

stdout:

Auto-merging content/developer/reference/user_interface/icons.rst
CONFLICT (content): Merge conflict in content/developer/reference/user_interface/icons.rst
warning: Cannot merge binary files: extensions/odoo_theme/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff (656e676e15e9bc659734b857891991877aa2dcc6 vs. 8a7908586731d6a8405564e6edaa009526b3027d)
Auto-merging extensions/odoo_theme/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff
CONFLICT (content): Merge conflict in extensions/odoo_theme/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff
warning: Cannot merge binary files: extensions/odoo_theme/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff2 (656e676e15e9bc659734b857891991877aa2dcc6 vs. 8a7908586731d6a8405564e6edaa009526b3027d)
Auto-merging extensions/odoo_theme/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff2
CONFLICT (content): Merge conflict in extensions/odoo_theme/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff2
Auto-merging extensions/odoo_theme/static/lib/odoo_ui_icons/style.css
CONFLICT (content): Merge conflict in extensions/odoo_theme/static/lib/odoo_ui_icons/style.css

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 29, 2026

@nikibrown this forward port of #16014 is awaiting action (not merged or closed).

@nikibrown nikibrown force-pushed the saas-19.1-19.0-update-ui-icon-font-nikbr-491522-fw branch from 0a5d674 to 8c3482e Compare January 29, 2026 18:34
@nikibrown
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Jan 29, 2026
closes #16069

X-original-commit: 9746f84
Signed-off-by: Niki Brown (nikbr) <nikbr@odoo.com>
@robodoo robodoo closed this Jan 29, 2026
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