Commits

tednaleid  committed e04a958

ok, really resolved conflict now

  • Participants
  • Parent commits dafcf6e

Comments (0)

Files changed (2)

     
 endif
 
- colorscheme molokai
+" colorscheme molokai
 "colorscheme vividchalk
 "set background=light
 "set background=dark
 "colorscheme solarized
-<<<<<<< local
 colorscheme Tomorrow-Night-Blue
 "colorscheme Tomorrow-Night-Eighties
 "colorscheme Tomorrow-Night
 "colorscheme Tomorrow
-=======
->>>>>>> other
 
 " resize current buffer by +/- 5 
 nnoremap <D-left> :vertical resize -5<cr>
-<<<<<<< local
 filetype off
-=======
-
-"
-
-filetyp off
->>>>>>> other
 call pathogen#runtime_append_all_bundles()
 filetype plugin indent on