Commits

Ben Bass committed dfbed73 Merge

merge

Comments (0)

Files changed (1)

 set nobackup
 set nowritebackup
 set noswapfile
+<<<<<<< local
 "set lines=40
 "set columns=80
+=======
+>>>>>>> other
 :nnoremap <F5> :buffers<CR>:buffer<Space>
 
 set expandtab