fix init.lua

1 year ago · 468783eb8b
parent 529538ecc3
commit 468783eb8b
1 changed files with 0 additions and 10 deletions
--- a/init.lua
+++ b/init.lua
@ -4,18 +4,8 @@
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '

-<<<<<<< HEAD
 -- Set to true if you have a Nerd Font installed
 vim.g.have_nerd_font = true
-=======
-<<<<<<< HEAD
-- Set to true if you have a Nerd Font installed and selected in the terminal
-vim.g.have_nerd_font = false
-=======
-- Set to true if you have a Nerd Font installed
-vim.g.have_nerd_font = true
->>>>>>> f434b82 (add new init.lua)
->>>>>>> nvim-lua-master

 -- [[ Setting options ]]
 -- See `:help vim.opt`