Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Sep 13, 2024

task-3709518

16.0: Keep Icons section from existing version

Forward-Port-Of: #10675

@robodoo
Copy link
Collaborator

robodoo commented Sep 13, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 13, 2024

@auva-odoo cherrypicking of pull request #10675 failed.

stdout:

CONFLICT (modify/delete): content/contributing/documentation/rst_cheat_sheet.rst deleted in 141256166f8fc088de0c510b0fb19e7492a8f154 and modified in d8b827cda431c3ec521fe3dbbd9f2857e8761df9.  Version d8b827cda431c3ec521fe3dbbd9f2857e8761df9 of content/contributing/documentation/rst_cheat_sheet.rst left in tree.
Auto-merging redirects/15.0.txt

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

@auva-odoo auva-odoo force-pushed the 16.0-15.0-doc-guidelines-auva-CO0o-fw branch from 6a01f02 to c5d0351 Compare September 13, 2024 13:37
@C3POdoo C3POdoo requested a review from a team September 13, 2024 13:39
@auva-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Sep 13, 2024
task-3709518

closes #11004

Signed-off-by: Audrey Vandromme (auva) <auva@odoo.com>
@auva-odoo
Copy link
Contributor

@robodoo r-

@auva-odoo auva-odoo force-pushed the 16.0-15.0-doc-guidelines-auva-CO0o-fw branch from c5d0351 to aa3a998 Compare September 13, 2024 14:08
@auva-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