commit 37381924f13e1fb7b56078b3ad2be67f925e1228
author Clément Béra <clementbera@google.com> Fri Oct 14 13:10:46 2022 +0200
committer Clément Béra <clementbera@google.com> Fri Oct 14 13:10:46 2022 +0200
tree f61d1da838d35301868d643f4dd1e6a50196f720
parent 5c3b60af2cfee73f4a794ac4b6bc45fe9fabd57c

Fix merge issue

Change-Id: I8fd7f1d6cf4fdd316ac784b3c96c1d5c4214a66b

src/library_desugar/jdk11/desugar_jdk_libs.json

diff --git a/src/library_desugar/jdk11/desugar_jdk_libs.json b/src/library_desugar/jdk11/desugar_jdk_libs.json
index 9c7db58..927f0d7 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs.json
@@ -114,8 +114,7 @@
         "java.time.ZonedDateTime java.util.GregorianCalendar#toZonedDateTime()": "java.util.DesugarGregorianCalendar"
       },
       "wrapper_conversion": [
-        "java.time.Clock",
-        "java.time.temporal.ChronoUnit"
+        "java.time.Clock"
       ],
       "custom_conversion": {
         "java.time.Duration": "java.time.TimeConversions",

src/library_desugar/jdk11/desugar_jdk_libs_nio.json

diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
index 6b7d1d8..e1e9875 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
@@ -121,8 +121,7 @@
         "java.time.ZonedDateTime java.util.GregorianCalendar#toZonedDateTime()": "java.util.DesugarGregorianCalendar"
       },
       "wrapper_conversion": [
-        "java.time.Clock",
-        "java.time.temporal.ChronoUnit"
+        "java.time.Clock"
       ],
       "custom_conversion": {
         "java.time.Duration": "java.time.TimeConversions",