fix: merge conflict

2024-03-29 09:45:31 +01:00
parent f308867570
commit 349ae03f09
2 changed files with 3 additions and 1 deletions
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@ -3,7 +3,8 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 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
 local defaults = {
--- a/lua/lazyvim/util/init.lua
+++ b/lua/lazyvim/util/init.lua
@ -1,6 +1,7 @@
 local LazyUtil = require("lazy.core.util")

 ---@class lazyvim.util: LazyUtilCore
+---@field config LazyVimConfig
 ---@field ui lazyvim.util.ui
 ---@field lsp lazyvim.util.lsp
 ---@field root lazyvim.util.root