Changed results due to ANGLE use
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Feb 2020 01:34:28 +0000 (01:34 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Feb 2020 01:34:28 +0000 (01:34 +0000)
commit38cbb72fedf0a8dac3e961c63e71902026ffe93f
tree58352def00aa71e4c9bcd5614863b94bf2adf63a
parent0d465b66b4cfc68b1cc724be19bf2c492d98b5b6
Changed results due to ANGLE use
https://bugs.webkit.org/show_bug.cgi?id=207858

Unreviewed test gardening.

Remove conflict markers that were accidentally added as part of r256880,
remove duplicated expectation for a test, and move the expectations to the same
file as the rest of the ANGLE related failures.

* platform/ios-wk2/TestExpectations:
* platform/ios/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256897 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/platform/ios-wk2/TestExpectations
LayoutTests/platform/ios/TestExpectations