Closed Bug 1888076 Opened 1 year ago Closed 1 year ago

[wpt-sync] Sync PR 45360 - Manually resolve conflict between pull/45144 and pull/45185

Categories

(Core :: DOM: Core & HTML, task, P4)

Product:
Core
Component:
DOM: Core & HTML
Type:
task

Tracking

()

Status:
RESOLVED INVALID

People

(Reporter: wpt-sync, Unassigned)

References

(
URL
)

Details

(Whiteboard: [wptsync downstream])

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

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

An Sung <ansung@google.com> wrote:

Manually resolve conflict between pull/45144 and pull/45185

the following merged PR: https://github.com/web-platform-tests/wpt/pull/45185
conflict with incoming PR: https://github.com/web-platform-tests/wpt/pull/45144

PR 45360 applied with additional changes from upstream: 49e8a846d9b1e9778c0cd4bdeb54bd796a5211fc, 8493a5fe8be2d8039c1bd42f8a75dc2510b52bad, 066ad51422c842bcc8c06c4a713821ebd121f690
Component: web-platform-tests → DOM: Core & HTML
Product: Testing → Core
Status: NEW → RESOLVED
Closed: 1 year ago
Resolution: --- → INVALID
You need to log in before you can comment on or make changes to this bug.