Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Part 1 of 3: Back out bad merge for develop->experimental #2398

Merged
merged 3 commits into from
Jan 3, 2019

Conversation

turt2live
Copy link
Member

This also backs out 2 of my PRs in the interest of not dealing with a complicated merge conflict. This also backs out #2395 because it is missing 206 commits.

@turt2live turt2live requested a review from a team January 3, 2019 22:40
@turt2live turt2live changed the title Part 1 of 2: Back out bad merge for develop->experimental Part 1 of 3: Back out bad merge for develop->experimental Jan 3, 2019
@jryans jryans self-assigned this Jan 3, 2019
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

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

Thanks, this seems correct to me.

@jryans jryans assigned turt2live and unassigned jryans Jan 3, 2019
@turt2live turt2live merged commit 2fe2e76 into experimental Jan 3, 2019
@turt2live turt2live deleted the travis/back-out-bad-merge branch January 3, 2019 23:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants