From d1167c2fe95baa9c1dd41c60875678bfb85d84fe Mon Sep 17 00:00:00 2001
From: mace <safemind@posteo.net>
Date: Fri, 3 Apr 2026 10:55:43 +0200
Subject: [PATCH] fix treesitter config, configs issue

---
 init.lua                 | 2 +-
 lua/custom/lspconfig.lua | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/init.lua b/init.lua
index ee5b642..f020a12 100644
--- a/init.lua
+++ b/init.lua
@@ -157,7 +157,7 @@ require('lazy').setup({
     lazy = false,
     build = ':TSUpdate',
     config = function()
-        require('nvim-treesitter.config').setup({
+        require('nvim-treesitter.configs').setup({
             ensure_installed = { 'bash', 'php', 'rust', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
             auto_install = true,
             highlight = {
diff --git a/lua/custom/lspconfig.lua b/lua/custom/lspconfig.lua
index 2b08ee5..28f7d71 100644
--- a/lua/custom/lspconfig.lua
+++ b/lua/custom/lspconfig.lua
@@ -158,16 +158,8 @@ setup_server("intelephense", {
     init_options = {
         licenceKey = (function()
             local license_path = vim.fn.expand("$HOME/.config/intelephense/license.txt")
-<<<<<<< HEAD
             if vim.fn.filereadable(license_path) == 1 then
                 return vim.fn.readfile(license_path)[1]
-=======
-            local file = io.open(license_path, "r")
-            if file then
-                local content = file:read("*l") -- read first line
-                file:close()
-                return content
->>>>>>> fbcc0b8d619e6f84448645f49d0a1dda9de840e5
             end
             return nil
         end)(),