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

browser(webkit): roll to ToT 4/22/2020 #1940

Merged
merged 1 commit into from
Apr 23, 2020
Merged

browser(webkit): roll to ToT 4/22/2020 #1940

merged 1 commit into from
Apr 23, 2020

Conversation

pavelfeldman
Copy link
Member

@pavelfeldman pavelfeldman commented Apr 23, 2020 •
edited
Loading

yury-s
yury-s reviewed Apr 23, 2020
View reviewed changes
browser_patches/webkit/patches/bootstrap.diff Outdated
-#endif // ENABLE(TOUCH_EVENTS)
+#endif // ENABLE(IOS_TOUCH_EVENTS)
+>>>>>>> c45e7018b32... chore: bootstrap build #1206
Copy link
Member

Choose a reason for hiding this comment

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

Is this expected?

Copy link
Member Author

Choose a reason for hiding this comment

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

whooops

@pavelfeldman pavelfeldman merged commit fa59372 into microsoft:master Apr 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yury-s yury-s yury-s 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
@pavelfeldman @yury-s