diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2014-11-05 17:42:50 +0000 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2014-11-05 17:42:50 +0000 |
| commit | 0af4d5a574db5b66c4997d342ab35ebd16aee86e (patch) | |
| tree | fb2ab4f8804d94052275119a933f4337dcecd25a /tmux.conf | |
| parent | b96ef221ac6491697bec471669c36722dfecbde7 (diff) | |
| parent | 48340f31f1c8e514fdada7359b8e417455b71d59 (diff) | |
Merge branch 'master' of https://github.com/uvaes/dotfiles
zshrc conflict
Diffstat (limited to 'tmux.conf')
0 files changed, 0 insertions, 0 deletions