Title: [282645] releases/WebKitGTK/webkit-2.32/LayoutTests
- Revision
- 282645
- Author
- [email protected]
- Date
- 2021-09-17 02:13:23 -0700 (Fri, 17 Sep 2021)
Log Message
Unreviewed fix to remove stray conflict markers after r276759
* platform/glib/TestExpectations: Remove stray conflict markers.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog (282644 => 282645)
--- releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog 2021-09-17 08:41:56 UTC (rev 282644)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog 2021-09-17 09:13:23 UTC (rev 282645)
@@ -1,3 +1,9 @@
+2021-09-17 Adrian Perez de Castro <[email protected]>
+
+ Unreviewed fix to remove stray conflict markers after r276759
+
+ * platform/glib/TestExpectations: Remove stray conflict markers.
+
2021-08-16 Antti Koivisto <[email protected]>
REGRESSION (r275756): Accelerated animations freeze when invalidating layout with shadow dom
Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/platform/glib/TestExpectations (282644 => 282645)
--- releases/WebKitGTK/webkit-2.32/LayoutTests/platform/glib/TestExpectations 2021-09-17 08:41:56 UTC (rev 282644)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/platform/glib/TestExpectations 2021-09-17 09:13:23 UTC (rev 282645)
@@ -550,12 +550,7 @@
webkit.org/b/207723 http/tests/contentextensions/hide-on-ping-with-ping-that-redirects.html [ Pass Failure ]
webkit.org/b/217961 http/tests/images/mp4-partial-load.html [ Timeout Pass ]
-<<<<<<< HEAD
-=======
-webkit.org/b/224109 http/tests/privateClickMeasurement/store-private-click-measurement-with-source-nonce.html [ Failure Pass ]
->>>>>>> 6b6396355c8 (REGRESSION(r274358) [GStreamer] http/tests/images/mp4-partial-load.html is flaky crashing inside GStreamer)
-
#////////////////////////////////////////////////////////////////////////////////////////
# End of HTTP-related bugs
#////////////////////////////////////////////////////////////////////////////////////////
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
