merge conflict

nvim/init.lua

@@ -1,5 +1,4 @@
 #require 'lspconfig'.clangd.setup{}
-
 vim.g.zig_fmt_autosave = 0
 vim.cmd("set number")
 vim.cmd("set tabstop=4")
@@ -86,3 +85,5 @@ vim.keymap.set('n', '<leader>fr', builtin.lsp_references, { desc = 'Telescope li
 vim.keymap.set('n', '<leader>fs', builtin.lsp_document_symbols, { desc = 'Telescope list all document symbols' })
 vim.keymap.set('n', '<leader>fd', builtin.lsp_definitions, { desc = 'Telescope defintions under cursor' })
 vim.keymap.set('n', '<leader>ft', builtin.lsp_type_definitions, { desc = 'Telescope definition of type under cursor' })
+=======
+vim.cmd("set ttyfast")