diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-03-27 15:31:32 +0000 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-03-27 15:31:32 +0000 |
| commit | 53203ab62154cd7c337ada62bf06094adc05325e (patch) | |
| tree | d7a49268837e721ac7cae7f4925109e30ae38a55 /.gitignore | |
| parent | 72de482ee4fa06bc096f70be5b2a12e10451068f (diff) | |
| parent | 02d2513655c0e94ac362791384d17372701e606e (diff) | |
Resolving conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,8 +1,8 @@ -# Plugins managed by Vundle +mutt/cache/headers +mutt/mailboxes vim/bundle/ vifm/Trash/ mutt/mutt-colors-solarized/ mutt/temp/ passwords -mutt/cache/ -mutt/cache/headers +mutt/cache/* |