Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][IMP] l10n_ar_account_tax_settlement: update inflation indexes #112

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #111

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

Ping @pablohmontenegro, @zaoral cherrypicking of pull request #111 failed.

stdout:

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

stderr:

16:18:03.593040 git.c:439               trace: built-in: git cherry-pick 3faf208f7d28ce0d105cd89354014f08327345e3
error: could not apply 3faf208... [IMP] l10n_ar_account_tax_settlement: update inflation indexes
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

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.

@zaoral zaoral force-pushed the 15.0-13.0-h-24871-pam-0AF3-fw branch from 5e563d1 to 1c71b77 Compare July 26, 2022 14:55
@zaoral
Copy link
Contributor

zaoral commented Jul 26, 2022

@roboadhoc r+

@roboadhoc roboadhoc closed this in bc80416 Jul 26, 2022
@roboadhoc roboadhoc temporarily deployed to merge July 26, 2022 15:38 Inactive
@zaoral zaoral deleted the 15.0-13.0-h-24871-pam-0AF3-fw branch July 26, 2022 18:27
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.

None yet

3 participants