# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1478915537 -3600
# Node ID c228c63f1ba9042276002d6c4a69659107ee8db9
# Parent  b3ffe2fba3ac2995f7b472559d1ba6df68fc80d4# Parent  93f7be107f46b30bf70a4016a019136fe78ae25e
Automated merge with https://localhost/hg/zsh-env

diff -r b3ffe2fba3ac -r c228c63f1ba9 zshrc-xanthippe
--- a/zshrc-xanthippe	Fri Nov 11 02:48:32 2016 +0100
+++ b/zshrc-xanthippe	Sat Nov 12 02:52:17 2016 +0100
@@ -5,6 +5,7 @@
 . ${HOME}/.zsh-env/zshrc-jdk
 . ${HOME}/.zsh-env/zshrc-maven
 . ${HOME}/.zsh-env/zshrc-bindkey
+. ${HOME}/.zsh-env/zshrc-docker
 
 GPG_AGENT_FILE="${HOME}/.gnupg/.gpg-agent-info"
 if [ -f "${GPG_AGENT_FILE}" ]; then