mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-28 19:50:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: merge conflict

Browse source
This commit is contained in:
Folke Lemaitre 2024-03-29 09:45:31 +01:00
parent f308867570
commit 349ae03f09
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lua/lazyvim/config/init.lua
View file

@ -3,7 +3,8 @@ _G.LazyVim = require("lazyvim.util")
---@class LazyVimConfig: LazyVimOptions ---@class LazyVimConfig: LazyVimOptions
local M = {} local M = {}
M.version = "10.21.0" -- x-release-please-version M.version = "10.20.1" -- x-release-please-version
LazyVim.config = M
---@class LazyVimOptions ---@class LazyVimOptions
local defaults = { local defaults = {

1
lua/lazyvim/util/init.lua
View file

@ -1,6 +1,7 @@
local LazyUtil = require("lazy.core.util") local LazyUtil = require("lazy.core.util")
---@class lazyvim.util: LazyUtilCore ---@class lazyvim.util: LazyUtilCore
---@field config LazyVimConfig
---@field ui lazyvim.util.ui ---@field ui lazyvim.util.ui
---@field lsp lazyvim.util.lsp ---@field lsp lazyvim.util.lsp
---@field root lazyvim.util.root ---@field root lazyvim.util.root