This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 35899e0ecd1 Temporarily skip contrib
35899e0ecd1 is described below
commit 35899e0ecd1fba087879395d4f2959c7ee1b7e86
Author: Jinbao Chen <[email protected]>
AuthorDate: Wed Oct 8 23:18:41 2025 +0800
Temporarily skip contrib
---
GNUmakefile.in | 80 +--
src/Makefile | 25 +-
src/bin/Makefile | 45 +-
src/include/Makefile | 2 -
src/timezone/data/tzdata.zi | 1284 ++-----------------------------------------
5 files changed, 129 insertions(+), 1307 deletions(-)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2f1dd4c558a..e5a54a0309d 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -11,32 +11,32 @@ include $(top_builddir)/src/Makefile.global
$(call recurse,all install,src config)
all:
- $(MAKE) -C contrib/auto_explain all
- $(MAKE) -C contrib/citext all
- $(MAKE) -C contrib/file_fdw all
- $(MAKE) -C contrib/formatter all
- $(MAKE) -C contrib/formatter_fixedwidth all
- $(MAKE) -C contrib/fuzzystrmatch all
- $(MAKE) -C contrib/extprotocol all
- $(MAKE) -C contrib/dblink all
- $(MAKE) -C contrib/indexscan all
- $(MAKE) -C contrib/interconnect all
- $(MAKE) -C contrib/pageinspect all # needed by src/test/isolation
- $(MAKE) -C contrib/hstore all
- $(MAKE) -C contrib/pgcrypto all
- $(MAKE) -C contrib/btree_gin all
- $(MAKE) -C contrib/pg_trgm all
- $(MAKE) -C contrib/tablefunc all
- $(MAKE) -C contrib/passwordcheck all
- $(MAKE) -C contrib/pg_buffercache all
+# $(MAKE) -C contrib/auto_explain all
+# $(MAKE) -C contrib/citext all
+# $(MAKE) -C contrib/file_fdw all
+# $(MAKE) -C contrib/formatter all
+# $(MAKE) -C contrib/formatter_fixedwidth all
+# $(MAKE) -C contrib/fuzzystrmatch all
+# $(MAKE) -C contrib/extprotocol all
+# $(MAKE) -C contrib/dblink all
+# $(MAKE) -C contrib/indexscan all
+# $(MAKE) -C contrib/interconnect all
+# $(MAKE) -C contrib/pageinspect all # needed by src/test/isolation
+# $(MAKE) -C contrib/hstore all
+# $(MAKE) -C contrib/pgcrypto all
+# $(MAKE) -C contrib/btree_gin all
+# $(MAKE) -C contrib/pg_trgm all
+# $(MAKE) -C contrib/tablefunc all
+# $(MAKE) -C contrib/passwordcheck all
+# $(MAKE) -C contrib/pg_buffercache all
ifeq ($(with_openssl), yes)
$(MAKE) -C contrib/sslinfo all
endif
ifeq ($(enable_pax), yes)
$(MAKE) -C contrib/pax_storage all
endif
- $(MAKE) -C gpMgmt all
- $(MAKE) -C gpcontrib all
+# $(MAKE) -C gpMgmt all
+# $(MAKE) -C gpcontrib all
+@echo "All of Apache Cloudberry successfully made. Ready to install."
docs:
@@ -58,32 +58,32 @@ html man:
$(MAKE) -C doc $@
install:
- $(MAKE) -C contrib/auto_explain $@
- $(MAKE) -C contrib/citext $@
- $(MAKE) -C contrib/file_fdw $@
- $(MAKE) -C contrib/formatter $@
- $(MAKE) -C contrib/formatter_fixedwidth $@
- $(MAKE) -C contrib/fuzzystrmatch $@
- $(MAKE) -C contrib/extprotocol $@
- $(MAKE) -C contrib/dblink $@
- $(MAKE) -C contrib/indexscan $@
- $(MAKE) -C contrib/interconnect $@
- $(MAKE) -C contrib/pageinspect $@ # needed by src/test/isolation
- $(MAKE) -C contrib/hstore $@
- $(MAKE) -C contrib/pgcrypto $@
- $(MAKE) -C contrib/btree_gin $@
- $(MAKE) -C contrib/pg_trgm $@
- $(MAKE) -C contrib/tablefunc $@
- $(MAKE) -C contrib/passwordcheck $@
- $(MAKE) -C contrib/pg_buffercache $@
+# $(MAKE) -C contrib/auto_explain $@
+# $(MAKE) -C contrib/citext $@
+# $(MAKE) -C contrib/file_fdw $@
+# $(MAKE) -C contrib/formatter $@
+# $(MAKE) -C contrib/formatter_fixedwidth $@
+# $(MAKE) -C contrib/fuzzystrmatch $@
+# $(MAKE) -C contrib/extprotocol $@
+# $(MAKE) -C contrib/dblink $@
+# $(MAKE) -C contrib/indexscan $@
+# $(MAKE) -C contrib/interconnect $@
+# $(MAKE) -C contrib/pageinspect $@ # needed by src/test/isolation
+# $(MAKE) -C contrib/hstore $@
+# $(MAKE) -C contrib/pgcrypto $@
+# $(MAKE) -C contrib/btree_gin $@
+# $(MAKE) -C contrib/pg_trgm $@
+# $(MAKE) -C contrib/tablefunc $@
+# $(MAKE) -C contrib/passwordcheck $@
+# $(MAKE) -C contrib/pg_buffercache $@
ifeq ($(enable_pax), yes)
$(MAKE) -C contrib/pax_storage $@
endif
ifeq ($(with_openssl), yes)
$(MAKE) -C contrib/sslinfo $@
endif
- $(MAKE) -C gpMgmt $@
- $(MAKE) -C gpcontrib $@
+# $(MAKE) -C gpMgmt $@
+# $(MAKE) -C gpcontrib $@
+@echo "Apache Cloudberry installation complete."
install-docs:
diff --git a/src/Makefile b/src/Makefile
index 7f544b03ea1..b0b699420df 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,6 +16,24 @@ include Makefile.mock
# In PostgreSQL, libpqwalreceiver is linked into a separate shared library.
# In GPDB, it's linked as a normal object, check
src/backend/replication/Makefile.
# Remove backend/replication/libpqwalreceiver from SUBDIRS here.
+#SUBDIRS = \
+# common \
+# port \
+# timezone \
+# backend \
+# backend/utils/mb/conversion_procs \
+# backend/snowball \
+# include \
+# interfaces \
+# backend/replication/pgoutput \
+# fe_utils \
+# bin
+# pl \
+# makefiles \
+# test/regress \
+# test/isolation \
+# test/perl
+
SUBDIRS = \
common \
port \
@@ -27,12 +45,7 @@ SUBDIRS = \
interfaces \
backend/replication/pgoutput \
fe_utils \
- bin \
- pl \
- makefiles \
- test/regress \
- test/isolation \
- test/perl
+ bin
ifeq ($(with_llvm), yes)
SUBDIRS += backend/jit/llvm
diff --git a/src/bin/Makefile b/src/bin/Makefile
index 2aa122a9113..898afc20e93 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -16,28 +16,31 @@ include $(top_builddir)/src/Makefile.global
unittest-check:
$(MAKE) -C pg_dump/test check
+#SUBDIRS = \
+# initdb \
+# gpfts \
+# pg_amcheck \
+# pg_archivecleanup \
+# pg_alterckey \
+# pg_basebackup \
+# pg_checksums \
+# pg_config \
+# pg_controldata \
+# pg_ctl \
+# pg_dump \
+# pg_resetwal \
+# pg_rewind \
+# pg_test_fsync \
+# pg_test_timing \
+# pg_upgrade \
+# pg_verifybackup \
+# pg_waldump \
+# pgbench \
+# psql \
+# scripts
+
SUBDIRS = \
- initdb \
- gpfts \
- pg_amcheck \
- pg_archivecleanup \
- pg_alterckey \
- pg_basebackup \
- pg_checksums \
- pg_config \
- pg_controldata \
- pg_ctl \
- pg_dump \
- pg_resetwal \
- pg_rewind \
- pg_test_fsync \
- pg_test_timing \
- pg_upgrade \
- pg_verifybackup \
- pg_waldump \
- pgbench \
- psql \
- scripts
+ initdb
ifeq ($(PORTNAME), win32)
SUBDIRS += pgevent
diff --git a/src/include/Makefile b/src/include/Makefile
index f6639834c59..d6cbf9a063d 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -46,7 +46,6 @@ install: all installdirs
$(INSTALL_DATA) pg_config.h '$(DESTDIR)$(includedir_server)'
$(INSTALL_DATA) pg_config_ext.h '$(DESTDIR)$(includedir_server)'
$(INSTALL_DATA) pg_config_os.h '$(DESTDIR)$(includedir_server)'
- $(INSTALL_DATA) nodes/nodetags.h '$(DESTDIR)$(includedir_server)/nodes'
$(INSTALL_DATA) utils/errcodes.h '$(DESTDIR)$(includedir_server)/utils'
$(INSTALL_DATA) utils/fmgroids.h '$(DESTDIR)$(includedir_server)/utils'
$(INSTALL_DATA) utils/fmgrprotos.h
'$(DESTDIR)$(includedir_server)/utils'
@@ -79,7 +78,6 @@ clean:
rm -f storage/lwlocknames.h utils/probes.h
rm -f catalog/schemapg.h catalog/system_fk_info.h
rm -f catalog/pg_*_d.h catalog/gp_*_d.h catalog/header-stamp
- rm -f nodes/nodetags.h nodes/header-stamp
distclean maintainer-clean: clean
rm -f pg_config.h pg_config_ext.h pg_config_os.h stamp-h stamp-ext-h
diff --git a/src/timezone/data/tzdata.zi b/src/timezone/data/tzdata.zi
index 2ff5dc9e032..a7fb52f1968 100644
--- a/src/timezone/data/tzdata.zi
+++ b/src/timezone/data/tzdata.zi
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# version 2022a
-=======
# version 2025b
->>>>>>> REL_16_9
# This zic input file is in the public domain.
R d 1916 o - Jun 14 23s 1 S
R d 1916 1919 - O Su>=1 23s 0 -
@@ -26,40 +22,6 @@ R d 1978 o - Mar 24 1 1 S
R d 1978 o - S 22 3 0 -
R d 1980 o - Ap 25 0 1 S
R d 1980 o - O 31 2 0 -
-<<<<<<< HEAD
-Z Africa/Algiers 0:12:12 - LMT 1891 Mar 16
-0:9:21 - PMT 1911 Mar 11
-0 d WE%sT 1940 F 25 2
-1 d CE%sT 1946 O 7
-0 - WET 1956 Ja 29
-1 - CET 1963 Ap 14
-0 d WE%sT 1977 O 21
-1 d CE%sT 1979 O 26
-0 d WE%sT 1981 May
-1 - CET
-Z Atlantic/Cape_Verde -1:34:4 - LMT 1912 Ja 1 2u
--2 - -02 1942 S
--2 1 -01 1945 O 15
--2 - -02 1975 N 25 2
--1 - -01
-Z Africa/Ndjamena 1:0:12 - LMT 1912
-1 - WAT 1979 O 14
-1 1 WAST 1980 Mar 8
-1 - WAT
-Z Africa/Abidjan -0:16:8 - LMT 1912
-0 - GMT
-L Africa/Abidjan Africa/Accra
-L Africa/Abidjan Africa/Bamako
-L Africa/Abidjan Africa/Banjul
-L Africa/Abidjan Africa/Conakry
-L Africa/Abidjan Africa/Dakar
-L Africa/Abidjan Africa/Freetown
-L Africa/Abidjan Africa/Lome
-L Africa/Abidjan Africa/Nouakchott
-L Africa/Abidjan Africa/Ouagadougou
-L Africa/Abidjan Atlantic/St_Helena
-=======
->>>>>>> REL_16_9
R K 1940 o - Jul 15 0 1 S
R K 1940 o - O 1 0 0 -
R K 1941 o - Ap 15 0 1 S
@@ -92,35 +54,8 @@ R K 2014 o - May 15 24 1 S
R K 2014 o - Jun 26 24 0 -
R K 2014 o - Jul 31 24 1 S
R K 2014 o - S lastTh 24 0 -
-<<<<<<< HEAD
-Z Africa/Cairo 2:5:9 - LMT 1900 O
-2 K EE%sT
-Z Africa/Bissau -1:2:20 - LMT 1912 Ja 1 1u
--1 - -01 1975
-0 - GMT
-Z Africa/Nairobi 2:27:16 - LMT 1908 May
-2:30 - +0230 1928 Jun 30 24
-3 - EAT 1930 Ja 4 24
-2:30 - +0230 1936 D 31 24
-2:45 - +0245 1942 Jul 31 24
-3 - EAT
-L Africa/Nairobi Africa/Addis_Ababa
-L Africa/Nairobi Africa/Asmara
-L Africa/Nairobi Africa/Dar_es_Salaam
-L Africa/Nairobi Africa/Djibouti
-L Africa/Nairobi Africa/Kampala
-L Africa/Nairobi Africa/Mogadishu
-L Africa/Nairobi Indian/Antananarivo
-L Africa/Nairobi Indian/Comoro
-L Africa/Nairobi Indian/Mayotte
-Z Africa/Monrovia -0:43:8 - LMT 1882
--0:43:8 - MMT 1919 Mar
--0:44:30 - MMT 1972 Ja 7
-0 - GMT
-=======
R K 2023 ma - Ap lastF 0 1 S
R K 2023 ma - O lastTh 24 0 -
->>>>>>> REL_16_9
R L 1951 o - O 14 2 1 S
R L 1952 o - Ja 1 0 0 -
R L 1953 o - O 9 2 1 S
@@ -359,38 +294,6 @@ R n 2005 o - May 1 0s 1 S
R n 2005 o - S 30 1s 0 -
R n 2006 2008 - Mar lastSu 2s 1 S
R n 2006 2008 - O lastSu 2s 0 -
-<<<<<<< HEAD
-Z Africa/Tunis 0:40:44 - LMT 1881 May 12
-0:9:21 - PMT 1911 Mar 11
-1 n CE%sT
-Z Antarctica/Casey 0 - -00 1969
-8 - +08 2009 O 18 2
-11 - +11 2010 Mar 5 2
-8 - +08 2011 O 28 2
-11 - +11 2012 F 21 17u
-8 - +08 2016 O 22
-11 - +11 2018 Mar 11 4
-8 - +08 2018 O 7 4
-11 - +11 2019 Mar 17 3
-8 - +08 2019 O 4 3
-11 - +11 2020 Mar 8 3
-8 - +08 2020 O 4 0:1
-11 - +11
-Z Antarctica/Davis 0 - -00 1957 Ja 13
-7 - +07 1964 N
-0 - -00 1969 F
-7 - +07 2009 O 18 2
-5 - +05 2010 Mar 10 20u
-7 - +07 2011 O 28 2
-5 - +05 2012 F 21 20u
-7 - +07
-Z Antarctica/Mawson 0 - -00 1954 F 13
-6 - +06 2009 O 18 2
-5 - +05
-Z Indian/Kerguelen 0 - -00 1950
-5 - +05
-=======
->>>>>>> REL_16_9
R Tr 2005 ma - Mar lastSu 1u 2 +02
R Tr 2004 ma - O lastSu 1u 0 +00
R AM 2011 o - Mar lastSu 2s 1 -
@@ -648,79 +551,8 @@ R J 2005 o - S lastF 0s 0 -
R J 2006 2011 - O lastF 0s 0 -
R J 2013 o - D 20 0 0 -
R J 2014 2021 - Mar lastTh 24 1 S
-<<<<<<< HEAD
-R J 2014 ma - O lastF 0s 0 -
-R J 2022 ma - F lastTh 24 1 S
-Z Asia/Amman 2:23:44 - LMT 1931
-2 J EE%sT
-Z Asia/Almaty 5:7:48 - LMT 1924 May 2
-5 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 R +05/+06 1992 Ja 19 2s
-6 R +06/+07 2004 O 31 2s
-6 - +06
-Z Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
-4 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1991 S 29 2s
-5 R +05/+06 1992 Ja 19 2s
-6 R +06/+07 1992 Mar 29 2s
-5 R +05/+06 2004 O 31 2s
-6 - +06 2018 D 21
-5 - +05
-Z Asia/Qostanay 4:14:28 - LMT 1924 May 2
-4 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 2004 O 31 2s
-6 - +06
-Z Asia/Aqtobe 3:48:40 - LMT 1924 May 2
-4 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 2004 O 31 2s
-5 - +05
-Z Asia/Aqtau 3:21:4 - LMT 1924 May 2
-4 - +04 1930 Jun 21
-5 - +05 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 1994 S 25 2s
-4 R +04/+05 2004 O 31 2s
-5 - +05
-Z Asia/Atyrau 3:27:44 - LMT 1924 May 2
-3 - +03 1930 Jun 21
-5 - +05 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 1999 Mar 28 2s
-4 R +04/+05 2004 O 31 2s
-5 - +05
-Z Asia/Oral 3:25:24 - LMT 1924 May 2
-3 - +03 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1989 Mar 26 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 1992 Mar 29 2s
-4 R +04/+05 2004 O 31 2s
-5 - +05
-=======
R J 2014 2022 - O lastF 0s 0 -
R J 2022 o - F lastTh 24 1 S
->>>>>>> REL_16_9
R KG 1992 1996 - Ap Su>=7 0s 1 -
R KG 1992 1996 - S lastSu 0 0 -
R KG 1997 2005 - Mar lastSu 2:30 1 -
@@ -804,69 +636,6 @@ R P 2015 o - O 23 1 0 -
R P 2016 2018 - Mar Sa<=30 1 1 S
R P 2016 2018 - O Sa<=30 1 0 -
R P 2019 o - Mar 29 0 1 S
-<<<<<<< HEAD
-R P 2019 o - O Sa>=24 0 0 -
-R P 2020 2021 - Mar Sa>=24 0 1 S
-R P 2020 o - O 24 1 0 -
-R P 2021 ma - O F>=23 1 0 -
-R P 2022 ma - Mar Su>=25 0 1 S
-Z Asia/Gaza 2:17:52 - LMT 1900 O
-2 Z EET/EEST 1948 May 15
-2 K EE%sT 1967 Jun 5
-2 Z I%sT 1996
-2 J EE%sT 1999
-2 P EE%sT 2008 Au 29
-2 - EET 2008 S
-2 P EE%sT 2010
-2 - EET 2010 Mar 27 0:1
-2 P EE%sT 2011 Au
-2 - EET 2012
-2 P EE%sT
-Z Asia/Hebron 2:20:23 - LMT 1900 O
-2 Z EET/EEST 1948 May 15
-2 K EE%sT 1967 Jun 5
-2 Z I%sT 1996
-2 J EE%sT 1999
-2 P EE%sT
-R PH 1936 o - N 1 0 1 D
-R PH 1937 o - F 1 0 0 S
-R PH 1954 o - Ap 12 0 1 D
-R PH 1954 o - Jul 1 0 0 S
-R PH 1978 o - Mar 22 0 1 D
-R PH 1978 o - S 21 0 0 S
-Z Asia/Manila -15:56 - LMT 1844 D 31
-8:4 - LMT 1899 May 11
-8 PH P%sT 1942 May
-9 - JST 1944 N
-8 PH P%sT
-Z Asia/Qatar 3:26:8 - LMT 1920
-4 - +04 1972 Jun
-3 - +03
-L Asia/Qatar Asia/Bahrain
-Z Asia/Riyadh 3:6:52 - LMT 1947 Mar 14
-3 - +03
-L Asia/Riyadh Antarctica/Syowa
-L Asia/Riyadh Asia/Aden
-L Asia/Riyadh Asia/Kuwait
-Z Asia/Singapore 6:55:25 - LMT 1901
-6:55:25 - SMT 1905 Jun
-7 - +07 1933
-7 0:20 +0720 1936
-7:20 - +0720 1941 S
-7:30 - +0730 1942 F 16
-9 - +09 1945 S 12
-7:30 - +0730 1982
-8 - +08
-Z Asia/Colombo 5:19:24 - LMT 1880
-5:19:32 - MMT 1906
-5:30 - +0530 1942 Ja 5
-5:30 0:30 +06 1942 S
-5:30 1 +0630 1945 O 16 2
-5:30 - +0530 1996 May 25
-6:30 - +0630 1996 O 26 0:30
-6 - +06 2006 Ap 15 0:30
-5:30 - +0530
-=======
R P 2019 o - O Sa<=30 0 0 -
R P 2020 2021 - Mar Sa<=30 0 1 S
R P 2020 o - O 24 1 0 -
@@ -962,7 +731,6 @@ R PH 1977 o - Mar 27 24 1 D
R PH 1977 o - S 21 24 0 S
R PH 1990 o - May 21 0 1 D
R PH 1990 o - Jul 28 24 0 S
->>>>>>> REL_16_9
R S 1920 1923 - Ap Su>=15 2 1 S
R S 1920 1923 - O Su>=1 2 0 -
R S 1962 o - Ap 29 2 1 S
@@ -1120,19 +888,6 @@ R FJ 2014 2018 - N Su>=1 2 1 -
R FJ 2015 2021 - Ja Su>=12 3 0 -
R FJ 2019 o - N Su>=8 2 1 -
R FJ 2020 o - D 20 2 1 -
-<<<<<<< HEAD
-R FJ 2022 ma - N Su>=8 2 1 -
-R FJ 2023 ma - Ja Su>=12 3 0 -
-Z Pacific/Fiji 11:55:44 - LMT 1915 O 26
-12 FJ +12/+13
-Z Pacific/Gambier -8:59:48 - LMT 1912 O
--9 - -09
-Z Pacific/Marquesas -9:18 - LMT 1912 O
--9:30 - -0930
-Z Pacific/Tahiti -9:58:16 - LMT 1912 O
--10 - -10
-=======
->>>>>>> REL_16_9
R Gu 1959 o - Jun 27 2 1 D
R Gu 1961 o - Ja 29 2 0 S
R Gu 1967 o - S 1 2 1 D
@@ -1147,71 +902,6 @@ R Gu 1976 o - May 26 2 1 D
R Gu 1976 o - Au 22 2:1 0 S
R Gu 1977 o - Ap 24 2 1 D
R Gu 1977 o - Au 28 2 0 S
-<<<<<<< HEAD
-Z Pacific/Guam -14:21 - LMT 1844 D 31
-9:39 - LMT 1901
-10 - GST 1941 D 10
-9 - +09 1944 Jul 31
-10 Gu G%sT 2000 D 23
-10 - ChST
-L Pacific/Guam Pacific/Saipan
-Z Pacific/Tarawa 11:32:4 - LMT 1901
-12 - +12
-Z Pacific/Kanton 0 - -00 1937 Au 31
--12 - -12 1979 O
--11 - -11 1994 D 31
-13 - +13
-Z Pacific/Kiritimati -10:29:20 - LMT 1901
--10:40 - -1040 1979 O
--10 - -10 1994 D 31
-14 - +14
-Z Pacific/Majuro 11:24:48 - LMT 1901
-11 - +11 1914 O
-9 - +09 1919 F
-11 - +11 1937
-10 - +10 1941 Ap
-9 - +09 1944 Ja 30
-11 - +11 1969 O
-12 - +12
-Z Pacific/Kwajalein 11:9:20 - LMT 1901
-11 - +11 1937
-10 - +10 1941 Ap
-9 - +09 1944 F 6
-11 - +11 1969 O
--12 - -12 1993 Au 20 24
-12 - +12
-Z Pacific/Chuuk -13:52:52 - LMT 1844 D 31
-10:7:8 - LMT 1901
-10 - +10 1914 O
-9 - +09 1919 F
-10 - +10 1941 Ap
-9 - +09 1945 Au
-10 - +10
-Z Pacific/Pohnpei -13:27:8 - LMT 1844 D 31
-10:32:52 - LMT 1901
-11 - +11 1914 O
-9 - +09 1919 F
-11 - +11 1937
-10 - +10 1941 Ap
-9 - +09 1945 Au
-11 - +11
-Z Pacific/Kosrae -13:8:4 - LMT 1844 D 31
-10:51:56 - LMT 1901
-11 - +11 1914 O
-9 - +09 1919 F
-11 - +11 1937
-10 - +10 1941 Ap
-9 - +09 1945 Au
-11 - +11 1969 O
-12 - +12 1999
-11 - +11
-Z Pacific/Nauru 11:7:40 - LMT 1921 Ja 15
-11:30 - +1130 1942 Au 29
-9 - +09 1945 S 8
-11:30 - +1130 1979 F 10 2
-12 - +12
-=======
->>>>>>> REL_16_9
R NC 1977 1978 - D Su>=1 0 1 -
R NC 1978 1979 - F 27 0 0 -
R NC 1996 o - D 1 2s 1 -
@@ -1244,78 +934,17 @@ R k 2008 ma - Ap Su>=1 2:45s 0 -
R CK 1978 o - N 12 0 0:30 -
R CK 1979 1991 - Mar Su>=1 0 0 -
R CK 1979 1990 - O lastSu 0 0:30 -
-<<<<<<< HEAD
-Z Pacific/Rarotonga 13:20:56 - LMT 1899 D 26
--10:39:4 - LMT 1952 O 16
--10:30 - -1030 1978 N 12
--10 CK -10/-0930
-Z Pacific/Niue -11:19:40 - LMT 1952 O 16
--11:20 - -1120 1964 Jul
--11 - -11
-Z Pacific/Norfolk 11:11:52 - LMT 1901
-11:12 - +1112 1951
-11:30 - +1130 1974 O 27 2s
-11:30 1 +1230 1975 Mar 2 2s
-11:30 - +1130 2015 O 4 2s
-11 - +11 2019 Jul
-11 AN +11/+12
-Z Pacific/Palau -15:2:4 - LMT 1844 D 31
-8:57:56 - LMT 1901
-9 - +09
-Z Pacific/Port_Moresby 9:48:40 - LMT 1880
-9:48:32 - PMMT 1895
-10 - +10
-L Pacific/Port_Moresby Antarctica/DumontDUrville
-Z Pacific/Bougainville 10:22:16 - LMT 1880
-9:48:32 - PMMT 1895
-10 - +10 1942 Jul
-9 - +09 1945 Au 21
-10 - +10 2014 D 28 2
-11 - +11
-Z Pacific/Pitcairn -8:40:20 - LMT 1901
--8:30 - -0830 1998 Ap 27
--8 - -08
-Z Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
--11:22:48 - LMT 1911
--11 - SST
-L Pacific/Pago_Pago Pacific/Midway
-=======
->>>>>>> REL_16_9
R WS 2010 o - S lastSu 0 1 -
R WS 2011 o - Ap Sa>=1 4 0 -
R WS 2011 o - S lastSa 3 1 -
R WS 2012 2021 - Ap Su>=1 4 0 -
R WS 2012 2020 - S lastSu 3 1 -
-<<<<<<< HEAD
-Z Pacific/Apia 12:33:4 - LMT 1892 Jul 5
--11:26:56 - LMT 1911
--11:30 - -1130 1950
--11 WS -11/-10 2011 D 29 24
-13 WS +13/+14
-Z Pacific/Guadalcanal 10:39:48 - LMT 1912 O
-11 - +11
-Z Pacific/Fakaofo -11:24:56 - LMT 1901
--11 - -11 2011 D 30
-13 - +13
-=======
->>>>>>> REL_16_9
R TO 1999 o - O 7 2s 1 -
R TO 2000 o - Mar 19 2s 0 -
R TO 2000 2001 - N Su>=1 2 1 -
R TO 2001 2002 - Ja lastSu 2 0 -
R TO 2016 o - N Su>=1 2 1 -
R TO 2017 o - Ja Su>=15 3 0 -
-<<<<<<< HEAD
-Z Pacific/Tongatapu 12:19:12 - LMT 1945 S 10
-12:20 - +1220 1961
-13 - +13 1999
-13 TO +13/+14
-Z Pacific/Funafuti 11:56:52 - LMT 1901
-12 - +12
-Z Pacific/Wake 11:6:28 - LMT 1901
-12 - +12
-=======
->>>>>>> REL_16_9
R VU 1973 o - D 22 12u 1 -
R VU 1974 o - Mar 30 12u 0 -
R VU 1983 1991 - S Sa>=22 24 1 -
@@ -1732,54 +1361,6 @@ R p 1943 1945 - Au Sa>=25 22s 1 S
R p 1944 1945 - Ap Sa>=21 22s 2 M
R p 1946 o - Ap Sa>=1 23s 1 S
R p 1946 o - O Sa>=1 23s 0 -
-<<<<<<< HEAD
-R p 1947 1965 - Ap Su>=1 2s 1 S
-R p 1947 1965 - O Su>=1 2s 0 -
-R p 1977 o - Mar 27 0s 1 S
-R p 1977 o - S 25 0s 0 -
-R p 1978 1979 - Ap Su>=1 0s 1 S
-R p 1978 o - O 1 0s 0 -
-R p 1979 1982 - S lastSu 1s 0 -
-R p 1980 o - Mar lastSu 0s 1 S
-R p 1981 1982 - Mar lastSu 1s 1 S
-R p 1983 o - Mar lastSu 2s 1 S
-Z Europe/Lisbon -0:36:45 - LMT 1884
--0:36:45 - LMT 1912 Ja 1 0u
-0 p WE%sT 1966 Ap 3 2
-1 - CET 1976 S 26 1
-0 p WE%sT 1983 S 25 1s
-0 W- WE%sT 1992 S 27 1s
-1 E CE%sT 1996 Mar 31 1u
-0 E WE%sT
-Z Atlantic/Azores -1:42:40 - LMT 1884
--1:54:32 - HMT 1912 Ja 1 2u
--2 p -02/-01 1942 Ap 25 22s
--2 p +00 1942 Au 15 22s
--2 p -02/-01 1943 Ap 17 22s
--2 p +00 1943 Au 28 22s
--2 p -02/-01 1944 Ap 22 22s
--2 p +00 1944 Au 26 22s
--2 p -02/-01 1945 Ap 21 22s
--2 p +00 1945 Au 25 22s
--2 p -02/-01 1966 Ap 3 2
--1 p -01/+00 1983 S 25 1s
--1 W- -01/+00 1992 S 27 1s
-0 E WE%sT 1993 Mar 28 1u
--1 E -01/+00
-Z Atlantic/Madeira -1:7:36 - LMT 1884
--1:7:36 - FMT 1912 Ja 1 1u
--1 p -01/+00 1942 Ap 25 22s
--1 p +01 1942 Au 15 22s
--1 p -01/+00 1943 Ap 17 22s
--1 p +01 1943 Au 28 22s
--1 p -01/+00 1944 Ap 22 22s
--1 p +01 1944 Au 26 22s
--1 p -01/+00 1945 Ap 21 22s
--1 p +01 1945 Au 25 22s
--1 p -01/+00 1966 Ap 3 2
-0 p WE%sT 1983 S 25 1s
-0 E WE%sT
-=======
R p 1947 1966 - Ap Su>=1 2s 1 S
R p 1947 1965 - O Su>=1 2s 0 -
R p 1976 o - S lastSu 1 0 -
@@ -1790,7 +1371,6 @@ R p 1978 o - O 1 1s 0 -
R p 1979 1980 - S lastSu 1s 0 -
R p 1981 1986 - Mar lastSu 0s 1 S
R p 1981 1985 - S lastSu 0s 0 -
->>>>>>> REL_16_9
R z 1932 o - May 21 0s 1 S
R z 1932 1939 - O Su>=1 0s 0 -
R z 1933 1939 - Ap Su>=2 0s 1 S
@@ -1800,262 +1380,6 @@ R z 1980 o - Ap 5 23 1 S
R z 1980 o - S lastSu 1 0 -
R z 1991 1993 - Mar lastSu 0s 1 S
R z 1991 1993 - S lastSu 0s 0 -
-<<<<<<< HEAD
-Z Europe/Bucharest 1:44:24 - LMT 1891 O
-1:44:24 - BMT 1931 Jul 24
-2 z EE%sT 1981 Mar 29 2s
-2 c EE%sT 1991
-2 z EE%sT 1994
-2 e EE%sT 1997
-2 E EE%sT
-Z Europe/Kaliningrad 1:22 - LMT 1893 Ap
-1 c CE%sT 1945 Ap 10
-2 O EE%sT 1946 Ap 7
-3 R MSK/MSD 1989 Mar 26 2s
-2 R EE%sT 2011 Mar 27 2s
-3 - +03 2014 O 26 2s
-2 - EET
-Z Europe/Moscow 2:30:17 - LMT 1880
-2:30:17 - MMT 1916 Jul 3
-2:31:19 R %s 1919 Jul 1 0u
-3 R %s 1921 O
-3 R MSK/MSD 1922 O
-2 - EET 1930 Jun 21
-3 R MSK/MSD 1991 Mar 31 2s
-2 R EE%sT 1992 Ja 19 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Simferopol 2:16:24 - LMT 1880
-2:16 - SMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 N
-1 c CE%sT 1944 Ap 13
-3 R MSK/MSD 1990
-3 - MSK 1990 Jul 1 2
-2 - EET 1992 Mar 20
-2 c EE%sT 1994 May
-3 e MSK/MSD 1996 Mar 31 0s
-3 1 MSD 1996 O 27 3s
-3 R MSK/MSD 1997
-3 - MSK 1997 Mar lastSu 1u
-2 E EE%sT 2014 Mar 30 2
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Astrakhan 3:12:12 - LMT 1924 May
-3 - +03 1930 Jun 21
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2016 Mar 27 2s
-4 - +04
-Z Europe/Volgograd 2:57:40 - LMT 1920 Ja 3
-3 - +03 1930 Jun 21
-4 - +04 1961 N 11
-4 R +04/+05 1988 Mar 27 2s
-3 R +03/+04 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2018 O 28 2s
-4 - +04 2020 D 27 2s
-3 - +03
-Z Europe/Saratov 3:4:18 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 R +04/+05 1988 Mar 27 2s
-3 R +03/+04 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2016 D 4 2s
-4 - +04
-Z Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03
-Z Europe/Samara 3:20:20 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 - +04 1935 Ja 27
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-2 R +02/+03 1991 S 29 2s
-3 - +03 1991 O 20 3
-4 R +04/+05 2010 Mar 28 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04
-Z Europe/Ulyanovsk 3:13:36 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-2 R +02/+03 1992 Ja 19 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2016 Mar 27 2s
-4 - +04
-Z Asia/Yekaterinburg 4:2:33 - LMT 1916 Jul 3
-3:45:5 - PMT 1919 Jul 15 4
-4 - +04 1930 Jun 21
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 2011 Mar 27 2s
-6 - +06 2014 O 26 2s
-5 - +05
-Z Asia/Omsk 4:53:30 - LMT 1919 N 14
-5 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 R +05/+06 1992 Ja 19 2s
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06
-Z Asia/Barnaul 5:35 - LMT 1919 D 10
-6 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 1995 May 28
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06 2016 Mar 27 2s
-7 - +07
-Z Asia/Novosibirsk 5:31:40 - LMT 1919 D 14 6
-6 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 1993 May 23
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06 2016 Jul 24 2s
-7 - +07
-Z Asia/Tomsk 5:39:51 - LMT 1919 D 22
-6 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 2002 May 1 3
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06 2016 May 29 2s
-7 - +07
-Z Asia/Novokuznetsk 5:48:48 - LMT 1924 May
-6 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 2010 Mar 28 2s
-6 R +06/+07 2011 Mar 27 2s
-7 - +07
-Z Asia/Krasnoyarsk 6:11:26 - LMT 1920 Ja 6
-6 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 2011 Mar 27 2s
-8 - +08 2014 O 26 2s
-7 - +07
-Z Asia/Irkutsk 6:57:5 - LMT 1880
-6:57:5 - IMT 1920 Ja 25
-7 - +07 1930 Jun 21
-8 R +08/+09 1991 Mar 31 2s
-7 R +07/+08 1992 Ja 19 2s
-8 R +08/+09 2011 Mar 27 2s
-9 - +09 2014 O 26 2s
-8 - +08
-Z Asia/Chita 7:33:52 - LMT 1919 D 15
-8 - +08 1930 Jun 21
-9 R +09/+10 1991 Mar 31 2s
-8 R +08/+09 1992 Ja 19 2s
-9 R +09/+10 2011 Mar 27 2s
-10 - +10 2014 O 26 2s
-8 - +08 2016 Mar 27 2
-9 - +09
-Z Asia/Yakutsk 8:38:58 - LMT 1919 D 15
-8 - +08 1930 Jun 21
-9 R +09/+10 1991 Mar 31 2s
-8 R +08/+09 1992 Ja 19 2s
-9 R +09/+10 2011 Mar 27 2s
-10 - +10 2014 O 26 2s
-9 - +09
-Z Asia/Vladivostok 8:47:31 - LMT 1922 N 15
-9 - +09 1930 Jun 21
-10 R +10/+11 1991 Mar 31 2s
-9 R +09/+10 1992 Ja 19 2s
-10 R +10/+11 2011 Mar 27 2s
-11 - +11 2014 O 26 2s
-10 - +10
-Z Asia/Khandyga 9:2:13 - LMT 1919 D 15
-8 - +08 1930 Jun 21
-9 R +09/+10 1991 Mar 31 2s
-8 R +08/+09 1992 Ja 19 2s
-9 R +09/+10 2004
-10 R +10/+11 2011 Mar 27 2s
-11 - +11 2011 S 13 0s
-10 - +10 2014 O 26 2s
-9 - +09
-Z Asia/Sakhalin 9:30:48 - LMT 1905 Au 23
-9 - +09 1945 Au 25
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 1997 Mar lastSu 2s
-10 R +10/+11 2011 Mar 27 2s
-11 - +11 2014 O 26 2s
-10 - +10 2016 Mar 27 2s
-11 - +11
-Z Asia/Magadan 10:3:12 - LMT 1924 May 2
-10 - +10 1930 Jun 21
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12 2014 O 26 2s
-10 - +10 2016 Ap 24 2s
-11 - +11
-Z Asia/Srednekolymsk 10:14:52 - LMT 1924 May 2
-10 - +10 1930 Jun 21
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12 2014 O 26 2s
-11 - +11
-Z Asia/Ust-Nera 9:32:54 - LMT 1919 D 15
-8 - +08 1930 Jun 21
-9 R +09/+10 1981 Ap
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12 2011 S 13 0s
-11 - +11 2014 O 26 2s
-10 - +10
-Z Asia/Kamchatka 10:34:36 - LMT 1922 N 10
-11 - +11 1930 Jun 21
-12 R +12/+13 1991 Mar 31 2s
-11 R +11/+12 1992 Ja 19 2s
-12 R +12/+13 2010 Mar 28 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12
-Z Asia/Anadyr 11:49:56 - LMT 1924 May 2
-12 - +12 1930 Jun 21
-13 R +13/+14 1982 Ap 1 0s
-12 R +12/+13 1991 Mar 31 2s
-11 R +11/+12 1992 Ja 19 2s
-12 R +12/+13 2010 Mar 28 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12
-Z Europe/Belgrade 1:22 - LMT 1884
-1 - CET 1941 Ap 18 23
-1 c CE%sT 1945
-1 - CET 1945 May 8 2s
-1 1 CEST 1945 S 16 2s
-1 - CET 1982 N 27
-1 E CE%sT
-L Europe/Belgrade Europe/Ljubljana
-L Europe/Belgrade Europe/Podgorica
-L Europe/Belgrade Europe/Sarajevo
-L Europe/Belgrade Europe/Skopje
-L Europe/Belgrade Europe/Zagreb
-L Europe/Prague Europe/Bratislava
-=======
->>>>>>> REL_16_9
R s 1918 o - Ap 15 23 1 S
R s 1918 1919 - O 6 24s 0 -
R s 1919 o - Ap 6 23 1 S
@@ -2130,184 +1454,52 @@ R T 1973 1976 - O Su>=31 2 0 -
R T 1974 o - Mar 31 2 1 S
R T 1975 o - Mar 22 2 1 S
R T 1976 o - Mar 21 2 1 S
-R T 1977 1978 - Ap Su>=1 2 1 S
-R T 1977 1978 - O Su>=15 2 0 -
-R T 1978 o - Jun 29 0 0 -
-R T 1983 o - Jul 31 2 1 S
-R T 1983 o - O 2 2 0 -
-R T 1985 o - Ap 20 1s 1 S
-R T 1985 o - S 28 1s 0 -
-R T 1986 1993 - Mar lastSu 1s 1 S
-R T 1986 1995 - S lastSu 1s 0 -
-R T 1994 o - Mar 20 1s 1 S
-R T 1995 2006 - Mar lastSu 1s 1 S
-R T 1996 2006 - O lastSu 1s 0 -
-<<<<<<< HEAD
-Z Europe/Istanbul 1:55:52 - LMT 1880
-1:56:56 - IMT 1910 O
-2 T EE%sT 1978 Jun 29
-3 T +03/+04 1984 N 1 2
-2 T EE%sT 2007
-2 E EE%sT 2011 Mar 27 1u
-2 - EET 2011 Mar 28 1u
-2 E EE%sT 2014 Mar 30 1u
-2 - EET 2014 Mar 31 1u
-2 E EE%sT 2015 O 25 1u
-2 1 EEST 2015 N 8 1u
-2 E EE%sT 2016 S 7
-3 - +03
-L Europe/Istanbul Asia/Istanbul
-Z Europe/Kiev 2:2:4 - LMT 1880
-2:2:4 - KMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 S 20
-1 c CE%sT 1943 N 6
-3 R MSK/MSD 1990 Jul 1 2
-2 1 EEST 1991 S 29 3
-2 c EE%sT 1996 May 13
-2 E EE%sT
-Z Europe/Uzhgorod 1:29:12 - LMT 1890 O
-1 - CET 1940
-1 c CE%sT 1944 O
-1 1 CEST 1944 O 26
-1 - CET 1945 Jun 29
-3 R MSK/MSD 1990
-3 - MSK 1990 Jul 1 2
-1 - CET 1991 Mar 31 3
-2 - EET 1992 Mar 20
-2 c EE%sT 1996 May 13
-2 E EE%sT
-Z Europe/Zaporozhye 2:20:40 - LMT 1880
-2:20 - +0220 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 Au 25
-1 c CE%sT 1943 O 25
-3 R MSK/MSD 1991 Mar 31 2
-2 e EE%sT 1992 Mar 20
-2 c EE%sT 1996 May 13
-2 E EE%sT
-=======
->>>>>>> REL_16_9
-R u 1918 1919 - Mar lastSu 2 1 D
-R u 1918 1919 - O lastSu 2 0 S
-R u 1942 o - F 9 2 1 W
-R u 1945 o - Au 14 23u 1 P
-R u 1945 o - S 30 2 0 S
-R u 1967 2006 - O lastSu 2 0 S
-R u 1967 1973 - Ap lastSu 2 1 D
-R u 1974 o - Ja 6 2 1 D
-R u 1975 o - F lastSu 2 1 D
-R u 1976 1986 - Ap lastSu 2 1 D
-R u 1987 2006 - Ap Su>=1 2 1 D
-R u 2007 ma - Mar Su>=8 2 1 D
-R u 2007 ma - N Su>=1 2 0 S
-R NY 1920 o - Mar lastSu 2 1 D
-R NY 1920 o - O lastSu 2 0 S
-R NY 1921 1966 - Ap lastSu 2 1 D
-R NY 1921 1954 - S lastSu 2 0 S
-R NY 1955 1966 - O lastSu 2 0 S
-R Ch 1920 o - Jun 13 2 1 D
-R Ch 1920 1921 - O lastSu 2 0 S
-R Ch 1921 o - Mar lastSu 2 1 D
-R Ch 1922 1966 - Ap lastSu 2 1 D
-R Ch 1922 1954 - S lastSu 2 0 S
-R Ch 1955 1966 - O lastSu 2 0 S
-R De 1920 1921 - Mar lastSu 2 1 D
-R De 1920 o - O lastSu 2 0 S
-R De 1921 o - May 22 2 0 S
-R De 1965 1966 - Ap lastSu 2 1 D
-R De 1965 1966 - O lastSu 2 0 S
-R CA 1948 o - Mar 14 2:1 1 D
-R CA 1949 o - Ja 1 2 0 S
-R CA 1950 1966 - Ap lastSu 1 1 D
-R CA 1950 1961 - S lastSu 2 0 S
-R CA 1962 1966 - O lastSu 2 0 S
-<<<<<<< HEAD
-Z America/Los_Angeles -7:52:58 - LMT 1883 N 18 12:7:2
--8 u P%sT 1946
--8 CA P%sT 1967
--8 u P%sT
-Z America/Juneau 15:2:19 - LMT 1867 O 19 15:33:32
--8:57:41 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1980 Ap 27 2
--9 u Y%sT 1980 O 26 2
--8 u P%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Sitka 14:58:47 - LMT 1867 O 19 15:30
--9:1:13 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Metlakatla 15:13:42 - LMT 1867 O 19 15:44:55
--8:46:18 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1983 O 30 2
--8 - PST 2015 N 1 2
--9 u AK%sT 2018 N 4 2
--8 - PST 2019 Ja 20 2
--9 u AK%sT
-Z America/Yakutat 14:41:5 - LMT 1867 O 19 15:12:18
--9:18:55 - LMT 1900 Au 20 12
--9 - YST 1942
--9 u Y%sT 1946
--9 - YST 1969
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Anchorage 14:0:24 - LMT 1867 O 19 14:31:37
--9:59:36 - LMT 1900 Au 20 12
--10 - AST 1942
--10 u A%sT 1967 Ap
--10 - AHST 1969
--10 u AH%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Nome 12:58:22 - LMT 1867 O 19 13:29:35
--11:1:38 - LMT 1900 Au 20 12
--11 - NST 1942
--11 u N%sT 1946
--11 - NST 1967 Ap
--11 - BST 1969
--11 u B%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Adak 12:13:22 - LMT 1867 O 19 12:44:35
--11:46:38 - LMT 1900 Au 20 12
--11 - NST 1942
--11 u N%sT 1946
--11 - NST 1967 Ap
--11 - BST 1969
--11 u B%sT 1983 O 30 2
--10 u AH%sT 1983 N 30
--10 u H%sT
-Z Pacific/Honolulu -10:31:26 - LMT 1896 Ja 13 12
--10:30 - HST 1933 Ap 30 2
--10:30 1 HDT 1933 May 21 12
--10:30 u H%sT 1947 Jun 8 2
--10 - HST
-Z America/Phoenix -7:28:18 - LMT 1883 N 18 11:31:42
--7 u M%sT 1944 Ja 1 0:1
--7 - MST 1944 Ap 1 0:1
--7 u M%sT 1944 O 1 0:1
--7 - MST 1967
--7 u M%sT 1968 Mar 21
--7 - MST
-L America/Phoenix America/Creston
-Z America/Boise -7:44:49 - LMT 1883 N 18 12:15:11
--8 u P%sT 1923 May 13 2
--7 u M%sT 1974
--7 - MST 1974 F 3 2
--7 u M%sT
-=======
->>>>>>> REL_16_9
+R T 1977 1978 - Ap Su>=1 2 1 S
+R T 1977 1978 - O Su>=15 2 0 -
+R T 1978 o - Jun 29 0 0 -
+R T 1983 o - Jul 31 2 1 S
+R T 1983 o - O 2 2 0 -
+R T 1985 o - Ap 20 1s 1 S
+R T 1985 o - S 28 1s 0 -
+R T 1986 1993 - Mar lastSu 1s 1 S
+R T 1986 1995 - S lastSu 1s 0 -
+R T 1994 o - Mar 20 1s 1 S
+R T 1995 2006 - Mar lastSu 1s 1 S
+R T 1996 2006 - O lastSu 1s 0 -
+R u 1918 1919 - Mar lastSu 2 1 D
+R u 1918 1919 - O lastSu 2 0 S
+R u 1942 o - F 9 2 1 W
+R u 1945 o - Au 14 23u 1 P
+R u 1945 o - S 30 2 0 S
+R u 1967 2006 - O lastSu 2 0 S
+R u 1967 1973 - Ap lastSu 2 1 D
+R u 1974 o - Ja 6 2 1 D
+R u 1975 o - F lastSu 2 1 D
+R u 1976 1986 - Ap lastSu 2 1 D
+R u 1987 2006 - Ap Su>=1 2 1 D
+R u 2007 ma - Mar Su>=8 2 1 D
+R u 2007 ma - N Su>=1 2 0 S
+R NY 1920 o - Mar lastSu 2 1 D
+R NY 1920 o - O lastSu 2 0 S
+R NY 1921 1966 - Ap lastSu 2 1 D
+R NY 1921 1954 - S lastSu 2 0 S
+R NY 1955 1966 - O lastSu 2 0 S
+R Ch 1920 o - Jun 13 2 1 D
+R Ch 1920 1921 - O lastSu 2 0 S
+R Ch 1921 o - Mar lastSu 2 1 D
+R Ch 1922 1966 - Ap lastSu 2 1 D
+R Ch 1922 1954 - S lastSu 2 0 S
+R Ch 1955 1966 - O lastSu 2 0 S
+R De 1920 1921 - Mar lastSu 2 1 D
+R De 1920 o - O lastSu 2 0 S
+R De 1921 o - May 22 2 0 S
+R De 1965 1966 - Ap lastSu 2 1 D
+R De 1965 1966 - O lastSu 2 0 S
+R CA 1948 o - Mar 14 2:1 1 D
+R CA 1949 o - Ja 1 2 0 S
+R CA 1950 1966 - Ap lastSu 1 1 D
+R CA 1950 1961 - S lastSu 2 0 S
+R CA 1962 1966 - O lastSu 2 0 S
R In 1941 o - Jun 22 2 1 D
R In 1941 1954 - S lastSu 2 0 S
R In 1946 1954 - Ap lastSu 2 1 D
@@ -2439,18 +1631,6 @@ R o 1946 1956 - S lastSu 2 0 S
R o 1957 1972 - O lastSu 2 0 S
R o 1993 2006 - Ap Su>=1 0:1 1 D
R o 1993 2006 - O lastSu 0:1 0 S
-<<<<<<< HEAD
-Z America/Moncton -4:19:8 - LMT 1883 D 9
--5 - EST 1902 Jun 15
--4 C A%sT 1933
--4 o A%sT 1942
--4 C A%sT 1946
--4 o A%sT 1973
--4 C A%sT 1993
--4 o A%sT 2007
--4 C A%sT
-=======
->>>>>>> REL_16_9
R t 1919 o - Mar 30 23:30 1 D
R t 1919 o - O 26 0 0 S
R t 1920 o - May 2 2 1 D
@@ -2469,31 +1649,6 @@ R t 1946 1973 - Ap lastSu 2 1 D
R t 1949 1950 - N lastSu 2 0 S
R t 1951 1956 - S lastSu 2 0 S
R t 1957 1973 - O lastSu 2 0 S
-<<<<<<< HEAD
-Z America/Toronto -5:17:32 - LMT 1895
--5 C E%sT 1919
--5 t E%sT 1942 F 9 2s
--5 C E%sT 1946
--5 t E%sT 1974
--5 C E%sT
-L America/Toronto America/Nassau
-Z America/Thunder_Bay -5:57 - LMT 1895
--6 - CST 1910
--5 - EST 1942
--5 C E%sT 1970
--5 t E%sT 1973
--5 - EST 1974
--5 C E%sT
-Z America/Nipigon -5:53:4 - LMT 1895
--5 C E%sT 1940 S 29
--5 1 EDT 1942 F 9 2s
--5 C E%sT
-Z America/Rainy_River -6:18:16 - LMT 1895
--6 C C%sT 1940 S 29
--6 1 CDT 1942 F 9 2s
--6 C C%sT
-=======
->>>>>>> REL_16_9
R W 1916 o - Ap 23 0 1 D
R W 1916 o - S 17 0 0 S
R W 1918 o - Ap 14 2 1 D
@@ -2562,22 +1717,6 @@ R Va 1946 1986 - Ap lastSu 2 1 D
R Va 1946 o - S 29 2 0 S
R Va 1947 1961 - S lastSu 2 0 S
R Va 1962 2006 - O lastSu 2 0 S
-<<<<<<< HEAD
-Z America/Vancouver -8:12:28 - LMT 1884
--8 Va P%sT 1987
--8 C P%sT
-Z America/Dawson_Creek -8:0:56 - LMT 1884
--8 C P%sT 1947
--8 Va P%sT 1972 Au 30 2
--7 - MST
-Z America/Fort_Nelson -8:10:47 - LMT 1884
--8 Va P%sT 1946
--8 - PST 1947
--8 Va P%sT 1987
--8 C P%sT 2015 Mar 8 2
--7 - MST
-=======
->>>>>>> REL_16_9
R Y 1918 o - Ap 14 2 1 D
R Y 1918 o - O 27 2 0 S
R Y 1919 o - May 25 2 1 D
@@ -2604,112 +1743,8 @@ R m 1996 2000 - Ap Su>=1 2 1 D
R m 1996 2000 - O lastSu 2 0 S
R m 2001 o - May Su>=1 2 1 D
R m 2001 o - S lastSu 2 0 S
-<<<<<<< HEAD
-R m 2002 ma - Ap Su>=1 2 1 D
-R m 2002 ma - O lastSu 2 0 S
-Z America/Cancun -5:47:4 - LMT 1922 Ja 1 0:12:56
--6 - CST 1981 D 23
--5 m E%sT 1998 Au 2 2
--6 m C%sT 2015 F 1 2
--5 - EST
-Z America/Merida -5:58:28 - LMT 1922 Ja 1 0:1:32
--6 - CST 1981 D 23
--5 - EST 1982 D 2
--6 m C%sT
-Z America/Matamoros -6:40 - LMT 1921 D 31 23:20
--6 - CST 1988
--6 u C%sT 1989
--6 m C%sT 2010
--6 u C%sT
-Z America/Monterrey -6:41:16 - LMT 1921 D 31 23:18:44
--6 - CST 1988
--6 u C%sT 1989
--6 m C%sT
-Z America/Mexico_City -6:36:36 - LMT 1922 Ja 1 0:23:24
--7 - MST 1927 Jun 10 23
--6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
--6 m C%sT 2001 S 30 2
--6 - CST 2002 F 20
--6 m C%sT
-Z America/Ojinaga -6:57:40 - LMT 1922 Ja 1 0:2:20
--7 - MST 1927 Jun 10 23
--6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2010
--7 u M%sT
-Z America/Chihuahua -7:4:20 - LMT 1921 D 31 23:55:40
--7 - MST 1927 Jun 10 23
--6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT
-Z America/Hermosillo -7:23:52 - LMT 1921 D 31 23:36:8
--7 - MST 1927 Jun 10 23
--6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1949 Ja 14
--8 - PST 1970
--7 m M%sT 1999
--7 - MST
-Z America/Mazatlan -7:5:40 - LMT 1921 D 31 23:54:20
--7 - MST 1927 Jun 10 23
--6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1949 Ja 14
--8 - PST 1970
--7 m M%sT
-Z America/Bahia_Banderas -7:1 - LMT 1921 D 31 23:59
--7 - MST 1927 Jun 10 23
--6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1949 Ja 14
--8 - PST 1970
--7 m M%sT 2010 Ap 4 2
--6 m C%sT
-Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 0:11:56
--7 - MST 1924
--8 - PST 1927 Jun 10 23
--7 - MST 1930 N 15
--8 - PST 1931 Ap
--8 1 PDT 1931 S 30
--8 - PST 1942 Ap 24
--8 1 PWT 1945 Au 14 23u
--8 1 PPT 1945 N 12
--8 - PST 1948 Ap 5
--8 1 PDT 1949 Ja 14
--8 - PST 1954
--8 CA P%sT 1961
--8 - PST 1976
--8 u P%sT 1996
--8 m P%sT 2001
--8 u P%sT 2002 F 20
--8 m P%sT 2010
--8 u P%sT
-=======
R m 2002 2022 - Ap Su>=1 2 1 D
R m 2002 2022 - O lastSu 2 0 S
->>>>>>> REL_16_9
R BB 1942 o - Ap 19 5u 1 D
R BB 1942 o - Au 31 6u 0 S
R BB 1943 o - May 2 5u 1 D
@@ -2721,13 +1756,6 @@ R BB 1977 1978 - O Su>=1 2 0 S
R BB 1978 1980 - Ap Su>=15 2 1 D
R BB 1979 o - S 30 2 0 S
R BB 1980 o - S 25 2 0 S
-<<<<<<< HEAD
-Z America/Barbados -3:58:29 - LMT 1911 Au 28
--4 BB A%sT 1944
--4 BB AST/-0330 1945
--4 BB A%sT
-=======
->>>>>>> REL_16_9
R BZ 1918 1941 - O Sa>=1 24 0:30 -0530
R BZ 1919 1942 - F Sa>=8 24 0 CST
R BZ 1942 o - Jun 27 24 1 CWT
@@ -2836,56 +1864,6 @@ R NI 2005 o - Ap 10 0 1 D
R NI 2005 o - O Su>=1 0 0 S
R NI 2006 o - Ap 30 2 1 D
R NI 2006 o - O Su>=1 1 0 S
-<<<<<<< HEAD
-Z America/Managua -5:45:8 - LMT 1890
--5:45:12 - MMT 1934 Jun 23
--6 - CST 1973 May
--5 - EST 1975 F 16
--6 NI C%sT 1992 Ja 1 4
--5 - EST 1992 S 24
--6 - CST 1993
--5 - EST 1997
--6 NI C%sT
-Z America/Panama -5:18:8 - LMT 1890
--5:19:36 - CMT 1908 Ap 22
--5 - EST
-L America/Panama America/Atikokan
-L America/Panama America/Cayman
-Z America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12
--4 - AST 1942 May 3
--4 u A%sT 1946
--4 - AST
-L America/Puerto_Rico America/Anguilla
-L America/Puerto_Rico America/Antigua
-L America/Puerto_Rico America/Aruba
-L America/Puerto_Rico America/Curacao
-L America/Puerto_Rico America/Blanc-Sablon
-L America/Puerto_Rico America/Dominica
-L America/Puerto_Rico America/Grenada
-L America/Puerto_Rico America/Guadeloupe
-L America/Puerto_Rico America/Kralendijk
-L America/Puerto_Rico America/Lower_Princes
-L America/Puerto_Rico America/Marigot
-L America/Puerto_Rico America/Montserrat
-L America/Puerto_Rico America/Port_of_Spain
-L America/Puerto_Rico America/St_Barthelemy
-L America/Puerto_Rico America/St_Kitts
-L America/Puerto_Rico America/St_Lucia
-L America/Puerto_Rico America/St_Thomas
-L America/Puerto_Rico America/St_Vincent
-L America/Puerto_Rico America/Tortola
-Z America/Miquelon -3:44:40 - LMT 1911 May 15
--4 - AST 1980 May
--3 - -03 1987
--3 C -03/-02
-Z America/Grand_Turk -4:44:32 - LMT 1890
--5:7:10 - KMT 1912 F
--5 - EST 1979
--5 u E%sT 2015 Mar 8 2
--4 - AST 2018 Mar 11 3
--5 u E%sT
-=======
->>>>>>> REL_16_9
R A 1930 o - D 1 0 1 -
R A 1931 o - Ap 1 0 0 -
R A 1931 o - O 15 0 1 -
@@ -2917,49 +1895,6 @@ R A 2008 2009 - Mar Su>=15 0 0 -
R A 2008 o - O Su>=15 0 1 -
R Sa 2008 2009 - Mar Su>=8 0 0 -
R Sa 2007 2008 - O Su>=8 0 1 -
-<<<<<<< HEAD
-Z America/Argentina/San_Luis -4:25:24 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1990
--3 1 -02 1990 Mar 14
--4 - -04 1990 O 15
--4 1 -03 1991 Mar
--4 - -04 1991 Jun
--3 - -03 1999 O 3
--4 1 -03 2000 Mar 3
--3 - -03 2004 May 31
--4 - -04 2004 Jul 25
--3 A -03/-02 2008 Ja 21
--4 Sa -04/-03 2009 O 11
--3 - -03
-Z America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 Jun
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
-Z America/Argentina/Ushuaia -4:33:12 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 May 30
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
-Z America/La_Paz -4:32:36 - LMT 1890
--4:32:36 - CMT 1931 O 15
--4:32:36 1 BST 1932 Mar 21
--4 - -04
-=======
->>>>>>> REL_16_9
R B 1931 o - O 3 11 1 -
R B 1932 1933 - Ap 1 0 0 -
R B 1932 o - O 3 0 1 -
@@ -3050,56 +1985,11 @@ R x 2012 2014 - S Su>=2 4u 1 -
R x 2016 2018 - May Su>=9 3u 0 -
R x 2016 2018 - Au Su>=9 4u 1 -
R x 2019 ma - Ap Su>=2 3u 0 -
-<<<<<<< HEAD
-R x 2019 ma - S Su>=2 4u 1 -
-Z America/Santiago -4:42:45 - LMT 1890
--4:42:45 - SMT 1910 Ja 10
--5 - -05 1916 Jul
--4:42:45 - SMT 1918 S 10
--4 - -04 1919 Jul
--4:42:45 - SMT 1927 S
--5 x -05/-04 1932 S
--4 - -04 1942 Jun
--5 - -05 1942 Au
--4 - -04 1946 Jul 15
--4 1 -03 1946 S
--4 - -04 1947 Ap
--5 - -05 1947 May 21 23
--4 x -04/-03
-Z America/Punta_Arenas -4:43:40 - LMT 1890
--4:42:45 - SMT 1910 Ja 10
--5 - -05 1916 Jul
--4:42:45 - SMT 1918 S 10
--4 - -04 1919 Jul
--4:42:45 - SMT 1927 S
--5 x -05/-04 1932 S
--4 - -04 1942 Jun
--5 - -05 1942 Au
--4 - -04 1947 Ap
--5 - -05 1947 May 21 23
--4 x -04/-03 2016 D 4
--3 - -03
-Z Pacific/Easter -7:17:28 - LMT 1890
--7:17:28 - EMT 1932 S
--7 x -07/-06 1982 Mar 14 3u
--6 x -06/-05
-Z Antarctica/Palmer 0 - -00 1965
--4 A -04/-03 1969 O 5
--3 A -03/-02 1982 May
--4 x -04/-03 2016 D 4
--3 - -03
-R CO 1992 o - May 3 0 1 -
-R CO 1993 o - Ap 4 0 0 -
-Z America/Bogota -4:56:16 - LMT 1884 Mar 13
--4:56:16 - BMT 1914 N 23
--5 CO -05/-04
-=======
R x 2019 2021 - S Su>=2 4u 1 -
R x 2022 o - S Su>=9 4u 1 -
R x 2023 ma - S Su>=2 4u 1 -
R CO 1992 o - May 3 0 1 -
R CO 1993 o - F 6 24 0 -
->>>>>>> REL_16_9
R EC 1992 o - N 28 0 1 -
R EC 1993 o - F 5 0 0 -
R FK 1937 1938 - S lastSu 0 1 -
@@ -3114,23 +2004,6 @@ R FK 1985 2000 - S Su>=9 0 1 -
R FK 1986 2000 - Ap Su>=16 0 0 -
R FK 2001 2010 - Ap Su>=15 2 0 -
R FK 2001 2010 - S Su>=1 2 1 -
-<<<<<<< HEAD
-Z Atlantic/Stanley -3:51:24 - LMT 1890
--3:51:24 - SMT 1912 Mar 12
--4 FK -04/-03 1983 May
--3 FK -03/-02 1985 S 15
--4 FK -04/-03 2010 S 5 2
--3 - -03
-Z America/Cayenne -3:29:20 - LMT 1911 Jul
--4 - -04 1967 O
--3 - -03
-Z America/Guyana -3:52:39 - LMT 1911 Au
--4 - -04 1915 Mar
--3:45 - -0345 1975 Au
--3 - -03 1992 Mar 29 1
--4 - -04
-=======
->>>>>>> REL_16_9
R y 1975 1988 - O 1 0 1 -
R y 1975 1978 - Mar 1 0 0 -
R y 1979 1991 - Ap 1 0 0 -
@@ -3163,19 +2036,6 @@ R PE 1990 o - Ja 1 0 1 -
R PE 1990 o - Ap 1 0 0 -
R PE 1994 o - Ja 1 0 1 -
R PE 1994 o - Ap 1 0 0 -
-<<<<<<< HEAD
-Z America/Lima -5:8:12 - LMT 1890
--5:8:36 - LMT 1908 Jul 28
--5 PE -05/-04
-Z Atlantic/South_Georgia -2:26:8 - LMT 1890
--2 - -02
-Z America/Paramaribo -3:40:40 - LMT 1911
--3:40:52 - PMT 1935
--3:40:36 - PMT 1945 O
--3:30 - -0330 1984 O
--3 - -03
-=======
->>>>>>> REL_16_9
R U 1923 1925 - O 1 0 0:30 -
R U 1924 1926 - Ap 1 0 0 -
R U 1933 1938 - O lastSu 0 0:30 -
@@ -5059,48 +3919,6 @@ Z Europe/Zurich 0:34:8 - LMT 1853 Jul 16
1 CH CE%sT 1981
1 E CE%sT
Z Factory 0 - -00
-<<<<<<< HEAD
-L Africa/Nairobi Africa/Asmera
-L Africa/Abidjan Africa/Timbuktu
-L America/Argentina/Catamarca America/Argentina/ComodRivadavia
-L America/Adak America/Atka
-L America/Argentina/Buenos_Aires America/Buenos_Aires
-L America/Argentina/Catamarca America/Catamarca
-L America/Panama America/Coral_Harbour
-L America/Argentina/Cordoba America/Cordoba
-L America/Tijuana America/Ensenada
-L America/Indiana/Indianapolis America/Fort_Wayne
-L America/Nuuk America/Godthab
-L America/Indiana/Indianapolis America/Indianapolis
-L America/Argentina/Jujuy America/Jujuy
-L America/Indiana/Knox America/Knox_IN
-L America/Kentucky/Louisville America/Louisville
-L America/Argentina/Mendoza America/Mendoza
-L America/Toronto America/Montreal
-L America/Rio_Branco America/Porto_Acre
-L America/Argentina/Cordoba America/Rosario
-L America/Tijuana America/Santa_Isabel
-L America/Denver America/Shiprock
-L America/Puerto_Rico America/Virgin
-L Pacific/Auckland Antarctica/South_Pole
-L Asia/Ashgabat Asia/Ashkhabad
-L Asia/Kolkata Asia/Calcutta
-L Asia/Shanghai Asia/Chongqing
-L Asia/Shanghai Asia/Chungking
-L Asia/Dhaka Asia/Dacca
-L Asia/Shanghai Asia/Harbin
-L Asia/Urumqi Asia/Kashgar
-L Asia/Kathmandu Asia/Katmandu
-L Asia/Macau Asia/Macao
-L Asia/Yangon Asia/Rangoon
-L Asia/Ho_Chi_Minh Asia/Saigon
-L Asia/Jerusalem Asia/Tel_Aviv
-L Asia/Thimphu Asia/Thimbu
-L Asia/Makassar Asia/Ujung_Pandang
-L Asia/Ulaanbaatar Asia/Ulan_Bator
-L Atlantic/Faroe Atlantic/Faeroe
-L Europe/Oslo Atlantic/Jan_Mayen
-=======
Z Indian/Chagos 4:49:40 - LMT 1907
5 - %z 1996
6 - %z
@@ -5224,7 +4042,6 @@ Z Pacific/Tongatapu 12:19:12 - LMT 1945 S 10
13 - %z 1999
13 TO %z
L Etc/GMT GMT
->>>>>>> REL_16_9
L Australia/Sydney Australia/ACT
L Australia/Lord_Howe Australia/LHI
L Australia/Sydney Australia/NSW
@@ -5288,15 +4105,6 @@ L Pacific/Auckland NZ
L Pacific/Chatham NZ-CHAT
L America/Denver Navajo
L Asia/Shanghai PRC
-<<<<<<< HEAD
-L Pacific/Kanton Pacific/Enderbury
-L Pacific/Honolulu Pacific/Johnston
-L Pacific/Pohnpei Pacific/Ponape
-L Pacific/Pago_Pago Pacific/Samoa
-L Pacific/Chuuk Pacific/Truk
-L Pacific/Chuuk Pacific/Yap
-=======
->>>>>>> REL_16_9
L Europe/Warsaw Poland
L Europe/Lisbon Portugal
L Asia/Taipei ROC
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]