diff options
Diffstat (limited to 'metadata/md5-cache/sys-libs/timezone-data-2019b-r2')
| -rw-r--r-- | metadata/md5-cache/sys-libs/timezone-data-2019b-r2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2019b-r2 b/metadata/md5-cache/sys-libs/timezone-data-2019b-r2 index cb46cfaf95c5..b0a7fa2de7b8 100644 --- a/metadata/md5-cache/sys-libs/timezone-data-2019b-r2 +++ b/metadata/md5-cache/sys-libs/timezone-data-2019b-r2 @@ -9,5 +9,9 @@ LICENSE=BSD public-domain RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)] SLOT=0 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2019b.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2019b.tar.gz +<<<<<<< HEAD _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=599cf455e9c2c0bfa0219aeed4e3402a |