From 349ae03f0997d20aa6b4a23315e62dfeab77d559 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 29 Mar 2024 09:45:31 +0100
Subject: [PATCH] fix: merge conflict

---
 lua/lazyvim/config/init.lua | 3 ++-
 lua/lazyvim/util/init.lua   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index d6d5bc29c..a5e45dc02 100644
--- 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 = {
diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua
index 93abe1017..f343c3383 100644
--- 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