Changeset 259657 in webkit

Timestamp:

Apr 7, 2020, 11:58:34 AM (6 years ago)

Author:

Truitt Savell

Message:

Fix my conflict Markers
​https://trac.webkit.org/changeset/259656/webkit

Unreviewed test gardening.

• platform/mac-wk1/TestExpectations:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• platform/mac-wk1/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-04-07  Truitt Savell  <tsavell@apple.com>
+
+        Fix my conflict Markers
+        https://trac.webkit.org/changeset/259656/webkit
+
+        Unreviewed test gardening.
+
+        * platform/mac-wk1/TestExpectations:
+
 2020-04-07  Truitt Savell  <tsavell@apple.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -956 +956 @@
 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