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

Invoice Discount Merge Conflicts #84

Merged

Conversation

fivetran-joemarkiewicz
Copy link
Contributor

This PR is intended to address merge conflicts with the next release branch. Minor changes will be made to account for any conflicts.

Please see PR #60 for details around updates made from the community PR.

@fivetran-joemarkiewicz fivetran-joemarkiewicz changed the base branch from main to bugfix/invoice-discount-consideration April 11, 2023 18:04
Copy link
Contributor Author

@fivetran-joemarkiewicz fivetran-joemarkiewicz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge conflicts addressed. Merging into the working branch to then be merged into the next release branch.

@fivetran-joemarkiewicz fivetran-joemarkiewicz merged commit f54eb8e into bugfix/invoice-discount-consideration Apr 11, 2023
@fivetran-joemarkiewicz fivetran-joemarkiewicz deleted the release/v0.5.3 branch April 11, 2023 18:07
@fivetran-joemarkiewicz fivetran-joemarkiewicz changed the title Release/v0.5.3 Invoice Discount Merge Conflicts Apr 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants