fix treesitter config, configs issue

2026-04-03 10:55:43 +02:00
parent 04f1abe4d1
commit d1167c2fe9
2 changed files with 1 additions and 9 deletions
@@ -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)(),