diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-04-20 10:27:00 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-04-20 10:27:00 +0100 |
| commit | 0ec233f671ee4e2dee05bd7ccb7e797bc81d9626 (patch) | |
| tree | 3fe9e22394d7727add4ac2948e6161f88a7c3469 /.gitignore | |
| parent | 2fdeb189a74a62dcf365c68f392b2367a0ca75a1 (diff) | |
| parent | f45ca78f56cac187737505a00469b8268b00ede5 (diff) | |
Merge branch 'master' of github.com:uvaes/dotfiles
Conflicts:
.gitignore
latexmkrc
make
mutt/muttrc
offlineimaprc
vim/mySnippets/all.snippets
vim/vimrc
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,8 +2,8 @@ mutt/cache/ mutt/mailboxes/ vim/bundle/ vifm/Trash +passwords mutt/mutt-colors-solarized/ mutt/temp/ -passwords mutt/cache/ mutt/cache/headers |