Title: [256713] trunk/LayoutTests
- Revision
- 256713
- Author
- [email protected]
- Date
- 2020-02-16 12:58:46 -0800 (Sun, 16 Feb 2020)
Log Message
Fix a typo and some merge conflict markers that
were checked in a few days ago.
* platform/mac-wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (256712 => 256713)
--- trunk/LayoutTests/ChangeLog 2020-02-16 15:43:08 UTC (rev 256712)
+++ trunk/LayoutTests/ChangeLog 2020-02-16 20:58:46 UTC (rev 256713)
@@ -1,3 +1,10 @@
+2020-02-16 Dean Jackson <[email protected]>
+
+ Fix a typo and some merge conflict markers that
+ were checked in a few days ago.
+
+ * platform/mac-wk2/TestExpectations:
+
2020-02-16 Zalan Bujtas <[email protected]>
[LFC] Enable LFC regression testing on fast/block/block-only
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (256712 => 256713)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-02-16 15:43:08 UTC (rev 256712)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-02-16 20:58:46 UTC (rev 256713)
@@ -1010,7 +1010,7 @@
webkit.org/b/207518 tiled-drawing/simple-document-with-margin-tiles.html [ Pass Failure ]
-webkit.rog/b/207571 http/tests/IndexedDB/collect-IDB-objects.https.html [ Pass Failure ]
+webkit.org/b/207571 http/tests/IndexedDB/collect-IDB-objects.https.html [ Pass Failure ]
webkit.org/b/207599 webgpu/whlsl/do-while-loop.html [ Pass ImageOnlyFailure ]
@@ -1040,12 +1040,8 @@
webkit.org/b/207785 fast/events/keydown-1.html [ Pass Failure ]
-<<<<<<< Updated upstream
webkit.org/b/207793 fast/html/marquee-child-wrap.html [ Pass ImageOnlyFailure ]
webkit.org/b/207796 [ Release ] fast/box-shadow/hidpi-box-shadow.html [ Pass ImageOnlyFailure ]
webkit.org/b/207798 webrtc/connection-state.html [ Pass Failure ]
-=======
-webkit.org/b/207796 [ Release ] fast/box-shadow/hidpi-box-shadow.html [ Pass ImageOnlyFailure ]
->>>>>>> Stashed changes
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
