summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/app-shells/zsh-5.6.2
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/app-shells/zsh-5.6.2')
-rw-r--r--metadata/md5-cache/app-shells/zsh-5.6.24
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-shells/zsh-5.6.2 b/metadata/md5-cache/app-shells/zsh-5.6.2
index 570477593e71..202e1847846d 100644
--- a/metadata/md5-cache/app-shells/zsh-5.6.2
+++ b/metadata/md5-cache/app-shells/zsh-5.6.2
@@ -10,5 +10,9 @@ PDEPEND=examples? ( app-doc/zsh-lovers )
RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
SLOT=0
SRC_URI=https://www.zsh.org/pub/zsh-5.6.2.tar.xz https://www.zsh.org/pub/old/zsh-5.6.2.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.6.2-doc.tar.xz )
+<<<<<<< HEAD
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+=======
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+>>>>>>> next
_md5_=5d0efcc61e57775f8ab86853ce678f57