summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/app-shells/zsh-9999
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/app-shells/zsh-9999')
-rw-r--r--metadata/md5-cache/app-shells/zsh-99994
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-shells/zsh-9999 b/metadata/md5-cache/app-shells/zsh-9999
index 4b6f7782eac3..07da7a176346 100644
--- a/metadata/md5-cache/app-shells/zsh-9999
+++ b/metadata/md5-cache/app-shells/zsh-9999
@@ -10,5 +10,9 @@ PDEPEND=examples? ( app-doc/zsh-lovers )
PROPERTIES=live
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
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+>>>>>>> next
_md5_=5798c7b5c25728a3418de57a31fc3f69