mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-02-24 12:28:32 +00:00
merge
This commit is contained in:
parent
ef413736e9
commit
ed4a039996
1 changed files with 8 additions and 0 deletions
|
@ -237,6 +237,7 @@ everyone.
|
||||||
- Fixed `project-nvim` command and keybinding
|
- Fixed `project-nvim` command and keybinding
|
||||||
- Added default ikeybind/command for `Telescope resume` (`<leader>fr`)
|
- Added default ikeybind/command for `Telescope resume` (`<leader>fr`)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
[Soliprem](https://github.com/Soliprem):
|
[Soliprem](https://github.com/Soliprem):
|
||||||
|
|
||||||
- Add LSP and Treesitter support for R under `vim.languages.R`.
|
- Add LSP and Treesitter support for R under `vim.languages.R`.
|
||||||
|
@ -249,3 +250,10 @@ everyone.
|
||||||
`vim.theme`
|
`vim.theme`
|
||||||
- Fix internal breakage in `elixir-tools` setup.
|
- Fix internal breakage in `elixir-tools` setup.
|
||||||
|
|
||||||
|
=======
|
||||||
|
[Soliprem](https://github.com/Soliprem)
|
||||||
|
|
||||||
|
- R:
|
||||||
|
- Added LSP
|
||||||
|
- Added Treesitter
|
||||||
|
>>>>>>> 27c045b (added changelog entry)
|
||||||
|
|
Loading…
Add table
Reference in a new issue