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

diff -r a7654f2b4170 -r 315142c3762b zshrc-xanthippe
--- a/zshrc-xanthippe	Thu Nov 17 07:35:48 2016 +0100
+++ b/zshrc-xanthippe	Fri Dec 02 17:48:44 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