Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolve conflicts for #2117 #2118
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
Uh oh!
There was an error while loading. Please reload this page.
Resolve conflicts for #2117 #2118
Changes from all commits
102f86863d16bb2b48bd1597c1f1ac1a07a9823330e46555443e2d84dddd52852c5ba3420e6c56255ec03720c1488b54f213d9577b04595ef4e120a5d4daff13e82401114686b9a4955ffee9132338adc7874be807cdc99c976f30f3c2f63dcb81ef7edce94b52e4c09e3534ebdd305436a5f3947b3a413d751b355e516a732fadd95b4c68d07ee8eb83758b3bab9af9f79e33a732b13c25bbea53f7381cfccea4da3d8d5e1e9166b5f3d54620fd190cacfa6ea3fd046a5e28fffcc734e5511893f0286033b6454cc8b50a36a398508386048bd90d5c93c98edc789bb9500fba0e9d2f94525032392c81272dd3634fd15568a8460d128b71fedd803f7ef9292fbff15571c6c532e977bb2674901de0eb5f3942ec7a3e3fe83392fa4b6f69ed8107ba83a8ff99f77d7ce1f5403e6a83ea99461f941c3a97f906abd9a94e29059b89e452b1746a8cf8e3493583d28bac2395dae24a9d5fd1ea68a2a919c861359d4205dd729e5a771a98dd8cbb018baa7b3fca285072fad15d87b70ddace10c2b0ccd3783f0836ba0d49f3183082b02ba90016aff36a37a8c5220c8cc6db354abe08b8caf6b0677e17d0319f46f874ab3e09d488fcc7fe6fe006b772ff83e0bf7551215b553f869ebb7782ac7923d083675ef9d5aba082446067a1d6fe3dd4ec09ff02da2283f49a91f33708843e16f374b6af91fe6b3203e81c3333e60743bd11869044bcb6e42d5e440b2a4941d6766753aaacace9922c828c61ec312749c73be6aee10d6e29edddbdd8de99a0e8d5207bba26e5c5c89461617720ae629a2e0122e74cf2efbc832f1db965ca092b89eee1e6f84767d82c5c5bd5db465ad0442cab9a23e0ac9a05f6d1926bd6b2aa2a1145911324a29abccb02432921e7873556253c274699c5d38fc4e028090f0616380499c403fa92e30f8d68ec7ab598c65a7ff6c07e824cfca5f1a1ff90db8e9262e09b5429f8a9add546a9c6affb00ef6b2e1db674e3fd903d1373c6fd4337d5068a91456117e2f865e5c00952b3fda9f8b83a0901a0ae039cd1801b7904103dc16ed6f818e38e7c547b0a5fc7b7f23180eb7ec1eddd689423b0d156f746f45aaa8be4ab2840fccb1bb5052ea45aa7783970853682cb10644ef65cf0802a7c369f9ad012d1864995a85ae4cf32e807b5a4e73281e502ffd48aaf1800073c3b197abcd471822073b86a18f3da13fc8d1fae92bd3ab42c0ca4909b753fFile filter
Filter by extension
Conversations
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
These merge commits were added into this branch cleanly.
There are no new changes to show.