tree f72f3f4e54b7650ac114b4cd13512fc46f71f745
parent 50714622b4bc5c6808f3073919a5ef68367610c4
author dan sinclair <dsinclair@google.com> 1587396081 +0000
committer David Neto <dneto@google.com> 1587396081 +0000

Fixup merge conflict.

Change-Id: I4f04677b1c9a4a29157d2940352042802ef88979
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/19960
Reviewed-by: David Neto <dneto@google.com>