From 54d2ec70b4914fd00de2725d2875fb87a084a51d Mon Sep 17 00:00:00 2001 From: Ben Allen Date: Mon, 7 Aug 2023 23:41:00 -0700 Subject: [PATCH] see previous --- .../prototype/resolvedOptions/hourCycle-default.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/intl402/DateTimeFormat/prototype/resolvedOptions/hourCycle-default.js b/test/intl402/DateTimeFormat/prototype/resolvedOptions/hourCycle-default.js index 6f57a5d8758..bad3f1d5bf0 100644 --- 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] ---*/