# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1481101654 -3600
# Node ID c45bcb8a7ba482064664a8039f41051714022536
# Parent  e6963f521d31c48659e9fd9a5255bcf399c9ed00# Parent  0896c2a1b0946ba7bbadd6cf21c254ca4521c422
Automated merge with https://localhost/hg/zsh-env

diff -r e6963f521d31 -r c45bcb8a7ba4 zshrc-xanthippe
--- a/zshrc-xanthippe	Tue Dec 06 08:45:01 2016 +0100
+++ b/zshrc-xanthippe	Wed Dec 07 10:07:34 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
@@ -15,4 +16,4 @@
 export GPG_TTY=`tty`
 export PATH="$HOME/bin:${PATH}"
 
-alias top=htop
+alias top="htop -C"