mirror of
https://github.com/tiyn/dotfiles.git
synced 2026-05-04 03:21:38 +02:00
Nvim: Fixed merge conflict
This commit is contained in:
@@ -29,11 +29,7 @@ return {
|
||||
|
||||
require("symbol-usage").setup({
|
||||
text_format = text_format,
|
||||
<<<<<<< HEAD
|
||||
vt_position = "end_of_line",
|
||||
||||||| 6714ddc
|
||||
=======
|
||||
>>>>>>> f01c70951e053d56cbfed781149becf3f9299a3f
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user