summaryrefslogtreecommitdiff
path: root/zshrc
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-05-05 10:11:22 +0100
committerUrbain Vaes <urbain@vaes.uk>2015-05-05 10:11:22 +0100
commit4bc51e7b9de161d88499809fdbfde9b1f14f0574 (patch)
treeb5cad37b3ce552254c58deed21f475979b95b2b3 /zshrc
parentde0abc242b09222489ed667a9becdb42a7a602fd (diff)
parentb512cd2427ce23bcd36c8b0bbdc9fcb6f6047e93 (diff)
Merge branch 'master' of github.com:uvaes/dotfiles
Conflicts: vimrc
Diffstat (limited to 'zshrc')
0 files changed, 0 insertions, 0 deletions