# HG changeset patch # User Dirk Olmes # Date 1530716580 -7200 # Node ID d683d08cf8e03663677dd7b2cca1893fb90492cb # Parent 8b961f7d78d924ead32c32ba10af863a73dacb85# Parent b44844181cf60bf5e835abfb950777e0bffd389b Automated merge with https://localhost/hg/zsh-env diff -r 8b961f7d78d9 -r d683d08cf8e0 zshrc-xanthippe --- a/zshrc-xanthippe Wed Jul 04 12:23:47 2018 +0200 +++ b/zshrc-xanthippe Wed Jul 04 17:03:00 2018 +0200 @@ -6,6 +6,7 @@ . ${HOME}/.zsh-env/zshrc-maven . ${HOME}/.zsh-env/zshrc-bindkey . ${HOME}/.zsh-env/zshrc-docker +. ${HOME}/.zsh-env/zshrc-ipv6 GPG_AGENT_FILE="${HOME}/.gnupg/.gpg-agent-info" if [ -f "${GPG_AGENT_FILE}" ]; then