Eryn Wells eeeb516897 [nvim] Fix the merge conflicts (again) in the nvim config files		2023-03-22 14:35:47 -07:00
..
after/syntax
lua	[nvim] Fix the merge conflicts (again) in the nvim config files	2023-03-22 14:35:47 -07:00
init.lua	[nvim] Fix the merge conflicts (again) in the nvim config files	2023-03-22 14:35:47 -07:00