Skip to content

Conversation

kylekeppler
Copy link
Contributor

@kylekeppler kylekeppler commented Jan 1, 2021

Backport PR #38471

@simonjayhawkins simonjayhawkins changed the title Backport PR #38471 on branch 1.2.x Backport PR #38471 on branch 1.2.x (DOC: fixes for assert_frame_equal check_freq argument) Jan 2, 2021
@simonjayhawkins simonjayhawkins added this to the 1.2.1 milestone Jan 2, 2021
@simonjayhawkins
Copy link
Member

@kylekeppler where were the merge conflicts that prevented the autobackport from working?

@simonjayhawkins
Copy link
Member

@kylekeppler where were the merge conflicts that prevented the autobackport from working?

nvm, i see now. I was focussing on the release notes and not the versionadded tag

@simonjayhawkins simonjayhawkins merged commit 44f6617 into pandas-dev:1.2.x Jan 2, 2021
@kylekeppler kylekeppler deleted the 1.2.x branch January 4, 2021 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants