diff options
| author | Ben Beltran <ben@nsovocal.com> | 2014-06-16 08:07:49 -0500 |
|---|---|---|
| committer | Ben Beltran <ben@nsovocal.com> | 2014-06-16 08:07:49 -0500 |
| commit | c06591654132cbc1c241d570e02ae518882e8c67 (patch) | |
| tree | b889f76dd38d812fc3a379fa5b2b6e4c628d9134 | |
| parent | 357710836fcc85419856fa820a2e81bc89b2c0e4 (diff) | |
| parent | 150c37fac6c34559f5ae754572e9aaa78dd15eb3 (diff) | |
Merge branch 'master' of github.com:benbeltran/dotfiles
Conflicts:
.gitignore
vim/bundle/searchfold.vim
vim/bundle/taglist
vim/bundle/vim-indent-object
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,2 +1,3 @@ .DS_Store vim/.backup +weechat/logs |