tree 04e6a186ae978b9f0246558437c18d879b5e8520
parent dadd149d9bb088595918e1a3df154619dc367ea7
author dan sinclair <dsinclair@chromium.org> 1591038041 +0000
committer dan sinclair <dsinclair@google.com> 1591038041 +0000

Fix merge conflict

Change-Id: Idd941099241e9310fea13932c3ef4fcf5083730a
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/22441
Reviewed-by: dan sinclair <dsinclair@google.com>