From 29ad561a5bcac156062f945e382a08d51ed83d88 Mon Sep 17 00:00:00 2001 From: Leon Date: Tue, 14 Mar 2023 11:24:59 +0100 Subject: [PATCH] Re-set up laptop --- nvim/.config/nvim/lazy-lock.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 14e95a8..2680d1a 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -47,6 +47,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" }, ======= @@ -60,11 +61,19 @@ "lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" }, >>>>>>> 2b14fd7 (äf) ======= +======= +>>>>>>> a524934 (Re-set up laptop) "lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" }, ======= "lazy.nvim": { "branch": "main", "commit": "5b4444f0d7e556deba3f7ca949a2ba0e2c3369fb" }, >>>>>>> 368c0a6 (update) +<<<<<<< HEAD >>>>>>> d3e05df (update) +======= +======= + "lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" }, +>>>>>>> d78e6c9 (Re-set up laptop) +>>>>>>> a524934 (Re-set up laptop) "litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" }, "lsp_lines.nvim": { "branch": "main", "commit": "ec98b45c8280e5ef8c84028d4f38aa447276c002" }, "lsp_signature.nvim": { "branch": "master", "commit": "6f6252f63b0baf0f2224c4caea33819a27f3f550" },