diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-03-30 12:12:49 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-03-30 12:12:49 +0100 |
| commit | 9a2ebe8e34e8be613da5e975b8a76e3b8ae7e215 (patch) | |
| tree | 612db282ca020914bfcc087638766abf83b1e8ab /.gitignore | |
| parent | b7e66c07bc4d99f03c542a77ee5e7aa353dd16c3 (diff) | |
| parent | 6fb28bc4b38947281908917b9230e78692674fdc (diff) | |
resolved merge conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -5,3 +5,5 @@ vifm/Trash/ mutt/mutt-colors-solarized/ mutt/temp/ passwords +mutt/cache/ +mutt/cache/headers |