remove merge conflict

config/nvim/init.vim

@@ -42,7 +42,6 @@ endif
 colorscheme space-vim-dark
 hi Comment cterm=italic
 
-
 " Relative numbers and when not in buiffer set absolute numbers
 set number relativenumber
 augroup numbertoggle
@@ -51,8 +50,6 @@ augroup numbertoggle
   autocmd BufLeave,FocusLost,InsertEnter   * set norelativenumber
 augroup END
 
-" Colors
-
 " Disable EX Mode
 map q: <Nop>
 " Disable EX Mode
@@ -87,8 +84,6 @@ let g:floaterm_keymap_toggle = '<F9>'
 let g:floaterm_width = 0.85
 let g:floaterm_height = 0.85
 
-
-
 "DISCORD PLUGIN
 " General options
 let g:presence_auto_update         = 1