Skip to content

Remove unused code (remainder from #15453) #15464

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

Merged
merged 1 commit into from
Oct 22, 2019

Conversation

timhoffm
Copy link
Member

PR Summary

This code does not have any effect and should have been removed already in #15453.

Copy link
Member

@jklymak jklymak left a comment

Choose a reason for hiding this comment

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

Sorry I missed that in review

@lumberbot-app
Copy link

lumberbot-app bot commented Oct 22, 2019

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v3.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 901e585e52a0ac36044d09dc65369bb86c4435f3
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #15464: Remove unused code (remainder from #15453)'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-15464-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

"Backport PR #15464 on branch v3.2.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@tacaswell
Copy link
Member

@meeseeksdev backport to v3.2.x

@tacaswell
Copy link
Member

The original 3.2.x backport failed because the original PR backport had not been merged, pushed the button on that one and re-triggered the auto-backporter.

tacaswell added a commit that referenced this pull request Oct 22, 2019
…464-on-v3.1.x

Backport PR #15464 on branch v3.1.x (Remove unused code (remainder from #15453))
@timhoffm timhoffm deleted the fix-doc-tick-locators branch October 22, 2019 16:33
anntzer added a commit that referenced this pull request Oct 22, 2019
Backport PR #15464 on branch v3.2.x (Remove unused code (remainder from #15453))
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.

4 participants