| commit | 6a3955b53372eb4fb3044bddf7b8ccf9c1a5349b | [log] [tgz] |
|---|---|---|
| author | Jim Blackler <jimblackler@google.com> | Wed Aug 21 10:06:04 2024 +0000 |
| committer | Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> | Wed Aug 21 10:06:04 2024 +0000 |
| tree | 802b341bb42af904653d281d1bd53559a3ac66bd | |
| parent | 7ee30f5d2f5ac77f9d856560a4971055854285ec [diff] |
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>
diff --git a/src/dawn/dawn_kotlin.json b/src/dawn/dawn_kotlin.json index 0860452..8b39c40 100644 --- a/src/dawn/dawn_kotlin.json +++ b/src/dawn/dawn_kotlin.json
@@ -36,7 +36,6 @@ "bool": "jboolean", "double": "jdouble", "float": "jfloat", - "double": "jdouble", "size_t": "jlong", "int32_t": "jint", "uint16_t": "jshort",