eryn/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[nvim] Fix the merge conflicts (again) in the nvim config files

Browse source
This commit is contained in:
Eryn Wells 2023-03-22 14:35:47 -07:00
parent 24229b0711
commit eeeb516897
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/nvim/lua/configuration.lua
View file

@ -1,10 +1,5 @@
-- Eryn Wells <eryn@erynwells.me>
<<<<<<< HEAD
=======
require 'os'
>>>>>>> 298c137 ([nvim] Fix the editor metadata settings, again, for hopefully the last time)
-- [[ Editor Confguration ]]
local opt = vim.opt