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.

Sign up for GitHub

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

Jump to bottom

Fix merge conflicts [skip ci] #236

Merged
merged 2 commits into from
May 24, 2021
Merged

Fix merge conflicts [skip ci] #236

merged 2 commits into from
May 24, 2021

Conversation

ajschmidt8
Copy link
Member

This PR fixes the merge conflicts in #235.

ajschmidt8 and others added 2 commits May 20, 2021 21:15
@ajschmidt8
Update CHANGELOG.md links for calver (#233)
6898f77 
This PR updates the `0.20` references in `CHANGELOG.md` to be `21.06`.

Authors:
  - AJ Schmidt (https://github.com/ajschmidt8)

Approvers:
  - Dillon Cullinan (https://github.com/dillon-cullinan)

URL: #233
@ajschmidt8
Merge remote-tracking branch 'upstream/branch-21.06' into branch-21.0…
bd40f7a 
…8-merge-21.06
@ajschmidt8 ajschmidt8 added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels May 24, 2021
@ajschmidt8 ajschmidt8 merged commit 8183ac9 into rapidsai:branch-21.08 May 24, 2021
@ajschmidt8 ajschmidt8 deleted the branch-21.08-merge-21.06 branch May 24, 2021 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dillon-cullinan dillon-cullinan dillon-cullinan approved these changes

Assignees
No one assigned
Labels
improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ajschmidt8 @dillon-cullinan