Skip to content

Conversation

@fw-bot-adhoc
Copy link
Contributor

…ty rules and templates

Forward-Port-Of: #335

@roboadhoc
Copy link

Pull request status dashboard

@fw-bot-adhoc
Copy link
Contributor Author

@lef-adhoc @lav-adhoc cherrypicking of pull request #335 failed.

stdout:

Auto-merging academic_hr/__manifest__.py
CONFLICT (content): Merge conflict in academic_hr/__manifest__.py

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 @roboadhoc.

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

@lef-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc
Copy link

@lef-adhoc @lav-adhoc 'ci/runbot-smarted' failed on this reviewed PR.

@lef-adhoc lef-adhoc force-pushed the 19.0-18.0-t-60427-lef-2509-fw branch from 04cfd54 to 5275447 Compare January 19, 2026 14:48
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