From 2ab1a848bd0935500ea4f4cb93b5a404a8a4ebc7 Mon Sep 17 00:00:00 2001
From: Agonex <edw.pener@gmail.com>
Date: Sat, 24 Aug 2024 22:52:29 +0400
Subject: [PATCH] Changed surronder plugin

---
 lua/plugins/colorscheme.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index ff3f4bc..9366081 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -1,8 +1,16 @@
 return {
+<<<<<<< Updated upstream
 	"folke/tokyonight.nvim",
 	lazy = false,
 	priority = 1000,
 	config = function()
 		vim.cmd([[colorscheme tokyonight]])
+=======
+	"Th3Whit3Wolf/one-nvim",
+	lazy = false, -- make sure we load this during startup if it is your main colorscheme
+	priority = 1000, -- make sure to load this before all the other start plugins
+	config = function()
+	--	vim.cmd([[colorscheme one-nvim]])
+>>>>>>> Stashed changes
 	end,
 }