see previous

tc39 · Aug 8, 2023 · 54d2ec7 · 54d2ec7
1 parent 896e086
commit 54d2ec7
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/test/intl402/DateTimeFormat/prototype/resolvedOptions/hourCycle-default.js b/test/intl402/DateTimeFormat/prototype/resolvedOptions/hourCycle-default.js
@@ -21,7 +21,6 @@ info: |
         c. If hc is null, set hc to dataLocaleData.[[hourCycle]].
   27. Set dateTimeFormat.[[HourCycle]] to hc.
 
->>>>>>> updated hourCycle-default.js to reflect new behaviour of hourCycle, which now associates h12 with h23 rather than h24. see https://github.com/tc39/ecma402/pull/758.
 locale: [en, fr, it, ja, zh, ko, ar, hi, en-u-hc-h24]
 ---*/