From ed4a03999642894249a1e5fc68d6b23776f61708 Mon Sep 17 00:00:00 2001
From: Soliprem <franci.solidoro@gmail.com>
Date: Mon, 7 Oct 2024 13:49:08 +0200
Subject: [PATCH] merge

---
 docs/release-notes/rl-0.7.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md
index bb9f3d36..db926cd0 100644
--- a/docs/release-notes/rl-0.7.md
+++ b/docs/release-notes/rl-0.7.md
@@ -237,6 +237,7 @@ everyone.
   - Fixed `project-nvim` command and keybinding
   - Added default ikeybind/command for `Telescope resume` (`<leader>fr`)
 
+<<<<<<< HEAD
 [Soliprem](https://github.com/Soliprem):
 
 - Add LSP and Treesitter support for R under `vim.languages.R`.
@@ -249,3 +250,10 @@ everyone.
   `vim.theme`
 - Fix internal breakage in `elixir-tools` setup.
 
+=======
+[Soliprem](https://github.com/Soliprem)
+
+- R:
+  - Added LSP
+  - Added Treesitter
+>>>>>>> 27c045b (added changelog entry)