remove merge conflict
This commit is contained in:
parent
202f16cb91
commit
4bff95319c
|
@ -42,7 +42,6 @@ endif
|
||||||
colorscheme space-vim-dark
|
colorscheme space-vim-dark
|
||||||
hi Comment cterm=italic
|
hi Comment cterm=italic
|
||||||
|
|
||||||
|
|
||||||
" Relative numbers and when not in buiffer set absolute numbers
|
" Relative numbers and when not in buiffer set absolute numbers
|
||||||
set number relativenumber
|
set number relativenumber
|
||||||
augroup numbertoggle
|
augroup numbertoggle
|
||||||
|
@ -51,8 +50,6 @@ augroup numbertoggle
|
||||||
autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
|
autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
" Colors
|
|
||||||
|
|
||||||
" Disable EX Mode
|
" Disable EX Mode
|
||||||
map q: <Nop>
|
map q: <Nop>
|
||||||
" Disable EX Mode
|
" Disable EX Mode
|
||||||
|
@ -87,8 +84,6 @@ let g:floaterm_keymap_toggle = '<F9>'
|
||||||
let g:floaterm_width = 0.85
|
let g:floaterm_width = 0.85
|
||||||
let g:floaterm_height = 0.85
|
let g:floaterm_height = 0.85
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
"DISCORD PLUGIN
|
"DISCORD PLUGIN
|
||||||
" General options
|
" General options
|
||||||
let g:presence_auto_update = 1
|
let g:presence_auto_update = 1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user