summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorfred-o <fredrik.appelberg@gmail.com>2012-02-20 09:41:45 +0100
committerfred-o <fredrik.appelberg@gmail.com>2012-02-20 09:41:45 +0100
commit7e5dda7f434b847e4a8899beb736a7251da3d390 (patch)
tree45eccafa617e7e3ec4e7e97ff7569b157786dd6c /lib
parentf5041025844a2509f42e0bb19cb8d5418340e10c (diff)
parent362927003bcd8052e294dcbdf14f061ef4f2e173 (diff)
downloadzsh-7e5dda7f434b847e4a8899beb736a7251da3d390.tar.gz
zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.tar.bz2
zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.zip
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'lib')
-rw-r--r--lib/git.zsh2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh
index defa062c6..4d1634e8b 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -61,4 +61,4 @@ git_prompt_status() {
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
fi
echo $STATUS
-}
+} \ No newline at end of file