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 21.08 forward-merge conflicts #803

Merged
merged 4 commits into from
Jun 11, 2021
Merged

Fix 21.08 forward-merge conflicts #803

merged 4 commits into from
Jun 11, 2021

Conversation

ajschmidt8
Copy link
Member

This PR fixes the merge conflicts in the latest forward-merger PR.

@ajschmidt8 ajschmidt8 requested a review from a team as a code owner June 11, 2021 18:47
@ajschmidt8 ajschmidt8 added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Jun 11, 2021
@github-actions github-actions bot added the gpuCI label Jun 11, 2021
@ajschmidt8 ajschmidt8 merged commit 045c6d6 into rapidsai:branch-21.08 Jun 11, 2021
@ajschmidt8 ajschmidt8 deleted the branch-21.08-merge-21.06 branch June 11, 2021 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gpuCI improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants