summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sys-libs/timezone-data-2019a
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
commitda491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch)
treed3e34a8bd906741ab18cf69d8d4f732853e26ade /metadata/md5-cache/sys-libs/timezone-data-2019a
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'metadata/md5-cache/sys-libs/timezone-data-2019a')
-rw-r--r--metadata/md5-cache/sys-libs/timezone-data-2019a4
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2019a b/metadata/md5-cache/sys-libs/timezone-data-2019a
index d4c0f7aa1e1f..6604185108ca 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2019a
+++ b/metadata/md5-cache/sys-libs/timezone-data-2019a
@@ -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/tzdata2019a.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2019a.tar.gz
+<<<<<<< HEAD
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+=======
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+>>>>>>> next
_md5_=9734c55c5ff74fb2c0bc49f443ec5361