[Gardening][ macOS Debug wk2 ] fast/css/identical-logical-height-decl…

….html is a flaky image failure https://bugs.webkit.org/show_bug.cgi?id=239818 Unreviewed test gardening. * LayoutTests/platform/mac-wk2/TestExpectations:
WebKit · May 11, 2022 · fb93a53 · fb93a53
1 parent 1c0e1fb
commit fb93a53
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -1715,11 +1715,5 @@ webkit.org/b/239627 [ arm64 ] fast/scrolling/mac/adjust-scroll-snap-during-gestu
 
 webkit.org/b/239634 [ arm64 ] media/modern-media-controls/tracks-support/text-track-selected-via-media-api.html [ Pass Failure ]
 
-<<<<<<< HEAD
-webkit.org/b/239818 [ Debug ] fast/css/identical-logical-height-decl.html [ Pass ImageOnlyFailure ]
-=======
-webkit.org/b/239818 [ Debug ] fast/css/variables/test-suite/168.html [ Pass ImageOnlyFailure ]
->>>>>>> 6d3bdd661e49 ([Gardening][ macOS Debug wk2 ] fast/css/identical-logical-height-decl.html is a flaky image failure)
-
 webkit.org/b/240123 imported/w3c/web-platform-tests/webrtc/protocol/rtp-clockrate.html [ Pass Failure ]