diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-06-03 18:12:03 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-06-03 18:12:03 +0100 |
| commit | 4d14de712eae7d9567ad6eb94731fb547872b8a3 (patch) | |
| tree | f742dd55dcc72af50b6a7c4552a45804a19dbba7 /i3/config.working | |
| parent | 4654d5c27926796979bdcf447a89e79a29eedac3 (diff) | |
| parent | 7344312c66b8d7f90a741dcf5a6a14b86c2f9c42 (diff) | |
Merge branch 'master' of https://github.com/uvaes/dotfiles
Conflicts:
vimrc
Diffstat (limited to 'i3/config.working')
0 files changed, 0 insertions, 0 deletions