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 @types/react conflict in matrix-react-sdk #13809

Merged
merged 1 commit into from
May 26, 2020
Merged

Fix @types/react conflict in matrix-react-sdk #13809

merged 1 commit into from
May 26, 2020

Conversation

JorikSchellekens
Copy link
Contributor

This is needed to resolve conflicts between the @types/react inside @types/react-dom and the top level @types/react.

Needed to land matrix-org/matrix-react-sdk#4635

@JorikSchellekens JorikSchellekens requested a review from a team May 26, 2020 11:15
@JorikSchellekens JorikSchellekens mentioned this pull request May 26, 2020
Merged
turt2live
turt2live approved these changes May 26, 2020
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

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

Presumably this will all be fine when we land the other half? Matching branch names usually fixes the CI.

@JorikSchellekens
Copy link
Contributor Author

It should be

@JorikSchellekens JorikSchellekens merged commit 492dd42 into element-hq:develop May 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@turt2live turt2live turt2live approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JorikSchellekens @turt2live