Title: [259657] trunk/LayoutTests
- Revision
- 259657
- Author
- [email protected]
- Date
- 2020-04-07 11:58:34 -0700 (Tue, 07 Apr 2020)
Log Message
Fix my conflict Markers
https://trac.webkit.org/changeset/259656/webkit
Unreviewed test gardening.
* platform/mac-wk1/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (259656 => 259657)
--- trunk/LayoutTests/ChangeLog 2020-04-07 18:53:56 UTC (rev 259656)
+++ trunk/LayoutTests/ChangeLog 2020-04-07 18:58:34 UTC (rev 259657)
@@ -1,5 +1,14 @@
2020-04-07 Truitt Savell <[email protected]>
+ Fix my conflict Markers
+ https://trac.webkit.org/changeset/259656/webkit
+
+ Unreviewed test gardening.
+
+ * platform/mac-wk1/TestExpectations:
+
+2020-04-07 Truitt Savell <[email protected]>
+
REGRESSION: (r258434) [ Mac WK1 ] media/track/track-css-user-override.html is a flaky failure
https://bugs.webkit.org/show_bug.cgi?id=210134
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (259656 => 259657)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2020-04-07 18:53:56 UTC (rev 259656)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2020-04-07 18:58:34 UTC (rev 259657)
@@ -955,8 +955,6 @@
webkit.org/b/209921 [ Debug ] inspector/css/add-css-property.html [ Pass Timeout ]
-<<<<<<< Updated upstream
webkit.org/b/210079 [ Debug ] inspector/debugger/evaluateOnCallFrame-errors.html [ Pass Failure ]
-=======
+
webkit.org/b/210134 media/track/track-css-user-override.html [ Pass Failure ]
->>>>>>> Stashed changes
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
