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

The backports of #392 and #390 did not work out as expected #420

Merged

Conversation

nickvergessen
Copy link
Member

Code added in #390 was not removed in #392
Ref #387

Code added in 390 was not removed in 392

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen merged commit 16b6bf2 into stable16 Sep 2, 2019
@delete-merged-branch delete-merged-branch bot deleted the bugfix/noid/fix-merge-conflict-of-backports branch September 2, 2019 07:10
@rullzer rullzer mentioned this pull request Sep 12, 2019
4 tasks
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.

2 participants