From 06cac8b32edf0e8408110dd986be3a8239fb9a3c Mon Sep 17 00:00:00 2001 From: Avery Black Date: Tue, 12 Oct 2021 22:45:20 -0700 Subject: [PATCH] I forgot to save --- package-lock.json | 10 ---------- package.json | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index d647626..fdd339b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,6 @@ "version": "0.0.1", "license": "CC-BY-NC-SA-4.0", "devDependencies": { -<<<<<<< HEAD "@vuepress/plugin-back-to-top": "^1.8.2", "markdown-it-multimd-table": "^4.1.1", "markdown-link-check": "^3.8.7", @@ -16,15 +15,6 @@ "run-script-os": "^1.1.6", "spellchecker-cli": "^4.8.0", "vuepress": "^1.8.2", -======= - "@vuepress/plugin-back-to-top": "^1.7.1", - "markdown-it-multimd-table": "^4.0.3", - "markdown-link-check": "^3.8.5", - "markdownlint-cli": "^0.26.0", - "run-script-os": "^1.1.5", - "spellchecker-cli": "^4.4.0", - "vuepress": "^1.7.1", ->>>>>>> 0e617c6... Test pass "vuepress-plugin-medium-zoom": "^1.1.9", "vuepress-plugin-zooming": "^1.1.8", "vuepress-theme-book": "0.0.6", diff --git a/package.json b/package.json index e82e476..bf74725 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ }, "license": "CC-BY-NC-SA-4.0", "devDependencies": { -<<<<<<< HEAD "@vuepress/plugin-back-to-top": "^1.8.2", "markdown-it-multimd-table": "^4.1.1", "markdown-link-check": "^3.8.7", @@ -41,15 +40,6 @@ "run-script-os": "^1.1.6", "spellchecker-cli": "^4.8.0", "vuepress": "^1.8.2", -======= - "@vuepress/plugin-back-to-top": "^1.7.1", - "markdown-it-multimd-table": "^4.0.3", - "markdown-link-check": "^3.8.5", - "markdownlint-cli": "^0.26.0", - "run-script-os": "^1.1.5", - "spellchecker-cli": "^4.4.0", - "vuepress": "^1.7.1", ->>>>>>> 0e617c6... Test pass "vuepress-plugin-medium-zoom": "^1.1.9", "vuepress-plugin-zooming": "^1.1.8", "vuepress-theme-book": "0.0.6",