diff --git a/lazyvim.json.orig b/lazyvim.json.orig deleted file mode 100644 index 7735fff..0000000 --- a/lazyvim.json.orig +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extras": [ -<<<<<<< HEAD - "lazyvim.plugins.extras.dap.core", - "lazyvim.plugins.extras.lang.java", - "lazyvim.plugins.extras.test.core" -======= - "lazyvim.plugins.extras.coding.mini-surround", - "lazyvim.plugins.extras.editor.mini-files" ->>>>>>> main - ], - "news": { - "NEWS.md": "6520" - }, -<<<<<<< HEAD - "version": 3 -======= - "version": 6 ->>>>>>> main -} \ No newline at end of file