Fix bad merge 'Merge branch 'master' into gecko/1498793'. #14175
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wpt-pr-bot
requested review from
agouaillard,
alvestrand,
dontcallmedom,
guidou,
henbos,
phoglund,
rwaldron,
snuggs and
youennf
|
@alvestrand PTAL. |
alvestrand
approved these changes
Nov 22, 2018
|
The firefox nightly test in Taskcluster seems to be timing out on some tests - I'll leave it to @jan-ivar to decide to merge on top of that or not. |
|
Yeah I saw those timeouts. They are intermittent in checkStopAfterSetLocalOffer, checkRemoteRollback and checkMsectionReuse. This PR isn't touching those, so I'm going to merge this. |
|
cc @docfaraday. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes merge error in #14023. Sorry.