Bug 173651 - LayoutTests/imported/w3c/resources/import-expectations.json is broken after http://trac.webkit.org/changeset/218181
Summary: LayoutTests/imported/w3c/resources/import-expectations.json is broken after h...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: youenn fablet
URL:
Keywords:
Depends on:
Blocks: 173649
  Show dependency tree / graph
 
Reported: 2017-06-21 08:16 PDT by youenn fablet
Modified: 2017-06-21 09:19 PDT (History)
5 users (show)

See Also:

Attachments
Patch (1.72 KB, patch)
2017-06-21 08:17 PDT, youenn fablet 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description youenn fablet 2017-06-21 08:16:01 PDT 
A merge went wrong
Comment 1 youenn fablet 2017-06-21 08:17:14 PDT 
Created attachment 313519 [details]
Patch
Comment 2 WebKit Commit Bot 2017-06-21 09:19:13 PDT 
Comment on attachment 313519 [details]
Patch

Clearing flags on attachment: 313519

Committed r218635: <http://trac.webkit.org/changeset/218635>
Comment 3 WebKit Commit Bot 2017-06-21 09:19:15 PDT 
All reviewed patches have been landed.  Closing bug.