From 3552dcffb933c1c609efd9a4c29d8e75f81c19f5 Mon Sep 17 00:00:00 2001
From: siduck76 <siduckk76@protonmail.com>
Date: Mon, 14 Jun 2021 23:21:16 +0530
Subject: [PATCH] fix conflicting mappings

---
 lua/dashboard.lua      | 4 ++--
 lua/telescope-nvim.lua | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lua/dashboard.lua b/lua/dashboard.lua
index 023618b..53b5f8c 100644
--- a/lua/dashboard.lua
+++ b/lua/dashboard.lua
@@ -23,6 +23,6 @@ g.dashboard_custom_section = {
     b = {description = {"  Recents                   SPC f o"}, command = "Telescope oldfiles"},
     c = {description = {"  Find Word                 SPC f w"}, command = "Telescope live_grep"},
     d = {description = {"洛 New File                  SPC f n"}, command = "DashboardNewFile"},
-    e = {description = {"󰓏  Bookmarks                 SPC f b"}, command = "Telescope marks"},
-    f = {description = {"  Load Last Session         SPC f s"}, command = "SessionLoad"}
+    e = {description = {"󰓏  Bookmarks                 SPC b m"}, command = "Telescope marks"},
+    f = {description = {"  Load Last Session         SPC s l"}, command = "SessionLoad"}
 }
diff --git a/lua/telescope-nvim.lua b/lua/telescope-nvim.lua
index 5cefecb..77182c5 100644
--- a/lua/telescope-nvim.lua
+++ b/lua/telescope-nvim.lua
@@ -77,6 +77,6 @@ vim.api.nvim_set_keymap("n", "<Leader>fm", [[<Cmd> Neoformat<CR>]], opt)
 -- dashboard stuff
 vim.api.nvim_set_keymap("n", "<Leader>fw", [[<Cmd> Telescope live_grep<CR>]], opt)
 vim.api.nvim_set_keymap("n", "<Leader>fn", [[<Cmd> DashboardNewFile<CR>]], opt)
-vim.api.nvim_set_keymap("n", "<Leader>fb", [[<Cmd> DashboardJumpMarks<CR>]], opt)
-vim.api.nvim_set_keymap("n", "<Leader>fl", [[<Cmd> SessionLoad<CR>]], opt)
-vim.api.nvim_set_keymap("n", "<Leader>fs", [[<Cmd> SessionSave<CR>]], opt)
+vim.api.nvim_set_keymap("n", "<Leader>bm", [[<Cmd> DashboardJumpMarks<CR>]], opt)
+vim.api.nvim_set_keymap("n", "<Leader>sl", [[<Cmd> SessionLoad<CR>]], opt)
+vim.api.nvim_set_keymap("n", "<Leader>ss", [[<Cmd> SessionSave<CR>]], opt)