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

[FIX] account_budget_oca: fails automatic merge because duplicated definition #25

Merged
merged 2 commits into from
Jul 11, 2019

Conversation

oihane
Copy link
Contributor

@oihane oihane commented Jul 10, 2019

@pedrobaeza pedrobaeza added this to the 12.0 milestone Jul 10, 2019
@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Rebased to 12.0-ocabot-merge-pr-25-by-pedrobaeza-bump-no, awaiting test results.

@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-25-by-pedrobaeza-bump-no.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Rebased to 12.0-ocabot-merge-pr-25-by-pedrobaeza-bump-no, awaiting test results.

@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-25-by-pedrobaeza-bump-no.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@oihane oihane force-pushed the 12.0-fix-account_budget_oca branch from 5e16947 to e57b0be Compare July 11, 2019 08:27
@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Rebased to 12.0-ocabot-merge-pr-25-by-pedrobaeza-bump-no, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit e57b0be into OCA:12.0 Jul 11, 2019
OCA-git-bot added a commit that referenced this pull request Jul 11, 2019
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 48b7b8e. Thanks a lot for contributing to OCA. ❤️

PS: Don't worry if GitHub says there are unmerged commits: it is due to a rebase before merge. All commits of this PR have been merged into 12.0.

@oihane oihane deleted the 12.0-fix-account_budget_oca branch September 24, 2019 07:55
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