Closed danila12 closed 2 months ago
/ocabot merge minor
This PR looks fantastic, let's merge it! Prepared branch 16.0-ocabot-merge-pr-1022-by-dhongu-bump-minor, awaiting test results.
@dhongu The merge process could not start, because command `git merge --no-ff -m 'Merge PR #1022 into 16.0
Signed-off-by dhongu' tmp-pr-1022` failed with output:
Auto-merging l10n_ro_account_edi_ubl/static/description/index.html
Auto-merging l10n_ro_account_edi_ubl/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ro_account_edi_ubl/__manifest__.py
Automatic merge failed; fix conflicts and then commit the result.
@dhongu The merge process could not be finalized, because command `git merge --no-ff -m 'Merge PR #1022 into 16.0
Signed-off-by dhongu' tmp-pr-1022` failed with output:
Auto-merging l10n_ro_account_edi_ubl/static/description/index.html
Auto-merging l10n_ro_account_edi_ubl/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ro_account_edi_ubl/__manifest__.py
Automatic merge failed; fix conflicts and then commit the result.
/ocabot merge minor
What a great day to merge this nice PR. Let's do it! Prepared branch 16.0-ocabot-merge-pr-1022-by-dhongu-bump-minor, awaiting test results.
Congratulations, your PR was merged at 1b37f1a5c285e01c2eb64adc0693e9f58c8bb161. Thanks a lot for contributing to OCA. ❤️
Hi @feketemihai, @dhongu, some modules you are maintaining are being modified, check this out!