Fixed merge conflict

This commit is contained in:
2021-12-15 08:22:58 -05:00
9 changed files with 2851 additions and 19 deletions

View File

@@ -37,7 +37,7 @@ o.scrolloff = 3 -- Minimal number of screen lines to keep above and below the cu
o.sidescrolloff = 5 -- The minimal number of columns to scroll horizontally
o.hlsearch = true -- highlight all matches on previous search pattern
o.ignorecase = true -- ignore case in search patterns
o.foldenable = false -- disable folding; enable with zi
o.foldenable = true -- disable folding; enable with zi
o.foldmethod = "expr"
o.foldexpr = "nvim_treesitter#foldexpr()"
-- o.listchars = "eol:¬,tab:>·,trail:~,extends:>,precedes:<"