fix init.lua
This commit is contained in:
parent
529538ecc3
commit
468783eb8b
10
init.lua
10
init.lua
|
@ -4,18 +4,8 @@
|
||||||
vim.g.mapleader = ' '
|
vim.g.mapleader = ' '
|
||||||
vim.g.maplocalleader = ' '
|
vim.g.maplocalleader = ' '
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
-- Set to true if you have a Nerd Font installed
|
-- Set to true if you have a Nerd Font installed
|
||||||
vim.g.have_nerd_font = true
|
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 ]]
|
-- [[ Setting options ]]
|
||||||
-- See `:help vim.opt`
|
-- See `:help vim.opt`
|
||||||
|
|
Loading…
Reference in New Issue