tree 802b341bb42af904653d281d1bd53559a3ac66bd
parent 7ee30f5d2f5ac77f9d856560a4971055854285ec
author Jim Blackler <jimblackler@google.com> 1724234764 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> 1724234764 +0000

Kotlin: Fix likely merge error.

Change-Id: I9effbb323f09cbd7453e14cd7958eb6df25e85ef
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/201874
Reviewed-by: Jim Blackler <jimblackler@google.com>
Commit-Queue: Jim Blackler <jimblackler@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>