summaryrefslogtreecommitdiff
path: root/lua/telescope_config.lua
diff options
context:
space:
mode:
authorHampusM <hampus@hampusmat.com>2024-06-09 13:52:08 +0200
committerHampusM <hampus@hampusmat.com>2024-06-09 13:52:08 +0200
commit5692bf2d44358c843a132d259f0c864b07cb30b3 (patch)
tree7e39eda03315fac117cc7dd60745f1382388fd95 /lua/telescope_config.lua
parente775b13c6ad8939033740d8ba5e95898905f9ad2 (diff)
use telescope-git-conflicts plugin
Diffstat (limited to 'lua/telescope_config.lua')
-rw-r--r--lua/telescope_config.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/lua/telescope_config.lua b/lua/telescope_config.lua
index 572e6bd..04719cb 100644
--- a/lua/telescope_config.lua
+++ b/lua/telescope_config.lua
@@ -7,6 +7,6 @@ require("telescope").setup({
}
})
-require('telescope').load_extension("fzf")
-require('telescope').load_extension("file_browser")
-
+require("telescope").load_extension("fzf")
+require("telescope").load_extension("file_browser")
+require("telescope").load_extension("conflicts")