diff options
| author | moehm | 2014-04-28 11:09:35 +0200 |
|---|---|---|
| committer | moehm | 2014-04-28 11:09:35 +0200 |
| commit | c8809f9a5764d24e120f7b64867e733cfaa25b07 (patch) | |
| tree | d26cd05d710d9e3b644cecefd68e0280468b0a5b /zsh/.zshrc | |
| parent | 9e83822613ff11520a5470f784ad07436dae4fae (diff) | |
| parent | 09c97f22ecbcbdf152308c60c79e0f9fea5e63e3 (diff) | |
| download | dotfiles-c8809f9a5764d24e120f7b64867e733cfaa25b07.tar.gz | |
merge conflict
Diffstat (limited to 'zsh/.zshrc')
| -rw-r--r-- | zsh/.zshrc | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -3325,3 +3325,11 @@ fi if [ -f ~/.zsh_dirstack ]; then . ~/.zsh_dirstack fi + +if [ -f ~/.zsh_prog ]; then + . ~/.zsh_prog +fi + +if [ -f ~/.zshrc_orig ]; then + . ~/.zshrc_orig +fi |