|
|
@@ -1,4 +1,3 @@
|
|
|
-<<<<<<< HEAD
|
|
|
" wreed vimrc
|
|
|
" vim: set foldmethod=marker:
|
|
|
|
|
|
@@ -16,13 +15,6 @@ set modeline
|
|
|
set relativenumber
|
|
|
" set foldmethod=syntax
|
|
|
set foldcolumn=3
|
|
|
-=======
|
|
|
-" wreed vimrc
|
|
|
-
|
|
|
-" set visual options
|
|
|
-set number
|
|
|
-set foldmethod=syntax
|
|
|
->>>>>>> e68403db8f74942c6ad9beb31a363e44b222c348
|
|
|
|
|
|
set expandtab
|
|
|
set shiftwidth=4
|
|
|
@@ -30,7 +22,6 @@ set softtabstop=4
|
|
|
set autoindent
|
|
|
set smartindent
|
|
|
set cindent
|
|
|
-<<<<<<< HEAD
|
|
|
filetype indent plugin on
|
|
|
|
|
|
colorscheme koehler
|
|
|
@@ -58,16 +49,3 @@ let pymode_lint_ignore="E501,E401,E225,W191,W391,W404"
|
|
|
au FileType python inoremap <expr> <S-Space> '<C-r>=RopeCodeAssistInsertMode()<CR><C-r>=pumvisible() ? "\<lt>C-p>\<lt>Down>" : ""<CR>'
|
|
|
" }}}
|
|
|
|
|
|
-=======
|
|
|
-
|
|
|
-colorscheme koehler
|
|
|
-
|
|
|
-" allow project-specific .vimrc files
|
|
|
-set exrc
|
|
|
-set secure
|
|
|
-
|
|
|
-" set default project options
|
|
|
-set makeprg=rakefds
|
|
|
-
|
|
|
-"this is a comment
|
|
|
->>>>>>> e68403db8f74942c6ad9beb31a363e44b222c348
|
wreed4