# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1322643942 -3600
# Node ID db85a076d8aea7090b7378300a932b3779643ba1
# Parent  ff5e785e7bf7699117ab63bedd2857c3ee0b587f# Parent  4263bbc594fe45efa145ce67ec6c999c3fbc1cdf
Automated merge with https://xanthippe/hg/zsh-env

diff -r 4263bbc594fe -r db85a076d8ae zshrc
--- a/zshrc	Wed Nov 30 10:05:36 2011 +0100
+++ b/zshrc	Wed Nov 30 10:05:42 2011 +0100
@@ -3,11 +3,11 @@
 #
 
 if [ -d $HOME/.oh-my-zsh ]; then
-	ZSH=$HOME/.oh-my-zsh
+    ZSH=$HOME/.oh-my-zsh
     . $HOME/.zsh-env/oh-my-zsh
 elif [ -d /var/lib/zsh/oh-my-zsh ]; then
-	ZSH=/var/lib/zsh/oh-my-zsh
-	. $HOME/.zsh-env/oh-my-zsh
+    ZSH=/var/lib/zsh/oh-my-zsh
+    . $HOME/.zsh-env/oh-my-zsh
 fi
 
 # get rid of some unwanted aliases from the oh-my-zsh env