deps: update timezone to 2023c

nodejs-github-bot · RafaelGSS · commit 19a92c49715b · 2023-04-05T16:46:41.000-03:00
PR-URL: #47302 Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/test/fixtures/tz-version.txt b/test/fixtures/tz-version.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 2022g
+=======
+2023c
+>>>>>>> 4204c5cffe (deps: update timezone to 2023c)

-Original file line number
+Diff line change
@@ @@ -1 +1,5 @@ @@
 +<<<<<<< HEAD
 g
 +=======
 +2023c
 +>>>>>>> 4204c5cffe (deps: update timezone to 2023c)