Closed Bug 1509239 Opened 6 years ago Closed 5 years ago

[wpt-sync] Sync PR 14175 - Fix bad merge 'Merge branch 'master' into gecko/1498793'.

Categories

(Core :: WebRTC, enhancement, P4)

Product:
Core
Component:
WebRTC
Type:
enhancement

Tracking

()

Status:
RESOLVED FIXED
Milestone:
mozilla66
Tracking Flags:
Tracking Status
firefox66 --- fixed

People

(Reporter: mozilla.org, Unassigned)

References

(
URL
)

Details

(Whiteboard: [wptsync downstream]) 

Sync web-platform-tests PR 14175 into mozilla-central (this bug is closed when the sync is complete).

PR: https://github.com/web-platform-tests/wpt/pull/14175
Details from upstream follow.

Jan-Ivar Bruaroey <wingboy@gmail.com> wrote:
>  Fix bad merge 'Merge branch 'master' into gecko/1498793'.
>  
>  Fixes merge error in https://github.com/web-platform-tests/wpt/pull/14023. Sorry.
Component: web-platform-tests → WebRTC
Product: Testing → Core
Whiteboard: [wptsync downstream] → [wptsync downstream error]
Whiteboard: [wptsync downstream error] → [wptsync downstream]
Result changes from PR not available.
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/dc5b16243cbf
[wpt PR 14175] - Fix bad merge 'Merge branch 'master' into gecko/1498793'., a=testonly
Pushed by james@hoppipolla.co.uk:
https://hg.mozilla.org/integration/mozilla-inbound/rev/a4fb2135c9e9
[wpt PR 14175] - Fix bad merge 'Merge branch 'master' into gecko/1498793'., a=testonly
https://hg.mozilla.org/mozilla-central/rev/a4fb2135c9e9
Status: NEW → RESOLVED
Closed: 5 years ago
status-firefox66: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla66
You need to log in before you can comment on or make changes to this bug.