tmp

init.lua

@@ -1,7 +1,4 @@
 require("config.lazy")
 require("config.general")
-<<<<<<< HEAD
-=======
 require("config.autocmd")
->>>>>>> c43d072 (tmp)
 

lazy-lock.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
@@ -26,7 +25,6 @@
   "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
   "vim-jukit": { "branch": "master", "commit": "73214c9a8abc4b6aa7a6266b5bc2ddbf8b3e3c00" },
   "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" }
-=======
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
@@ -51,5 +49,4 @@
   "telescope.nvim": { "branch": "master", "commit": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4" },
   "vim-jukit": { "branch": "master", "commit": "73214c9a8abc4b6aa7a6266b5bc2ddbf8b3e3c00" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
->>>>>>> c43d072 (tmp)
 }

lua/config/general.lua

@@ -10,13 +10,10 @@ vim.opt.nu = true
 vim.cmd([[set listchars=eol:$,tab:>-,trail:~,extends:>,precedes:<,space:•]])
 vim.keymap.set("n", "<leader>hc", ":set list!<CR>", { silent = true })
 
-<<<<<<< HEAD
-=======
 vim.keymap.set("n", ".", ":", {})
 
 vim.keymap.set("i", "jk", "", {})
 
->>>>>>> c43d072 (tmp)
 vim.opt.termguicolors = true
 
 vim.opt.hlsearch = false