diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-06-26 11:21:55 +0200 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-06-26 11:21:55 +0200 |
| commit | f526017928ea2c928877dc519ad97dc5ffafd416 (patch) | |
| tree | 2010630a4158d7adc829f2052f2e8ec3fe5f4b7f /i3/config.bak | |
| parent | e9a5df445029f95b6d44f9c7b086bf33f4275acf (diff) | |
| parent | 17d2ff0828ed8e6e7e59948fb14f17fd5ee5f8e2 (diff) | |
Merge branch 'master' of github.com:uvaes/dotfiles
Conflicts:
zshrc
Diffstat (limited to 'i3/config.bak')
0 files changed, 0 insertions, 0 deletions