AskDavis/Getting-Started-With-ACPI
1
0
Fork 0
mirror of https://github.com/AskDavis/Getting-Started-With-ACPI.git synced 2026-01-04 21:09:47 -08:00
Code Issues Packages Projects Releases Wiki Activity

I forgot to save

Browse Source
This commit is contained in:
Avery Black
2021-10-12 22:45:20 -07:00
parent b64e702a1e
commit 06cac8b32e
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package-lock.json generated
View File

@@ -8,7 +8,6 @@
"version": "0.0.1", "version": "0.0.1",
"license": "CC-BY-NC-SA-4.0", "license": "CC-BY-NC-SA-4.0",
"devDependencies": { "devDependencies": {
<<<<<<< HEAD
"@vuepress/plugin-back-to-top": "^1.8.2", "@vuepress/plugin-back-to-top": "^1.8.2",
"markdown-it-multimd-table": "^4.1.1", "markdown-it-multimd-table": "^4.1.1",
"markdown-link-check": "^3.8.7", "markdown-link-check": "^3.8.7",
@@ -16,15 +15,6 @@
"run-script-os": "^1.1.6", "run-script-os": "^1.1.6",
"spellchecker-cli": "^4.8.0", "spellchecker-cli": "^4.8.0",
"vuepress": "^1.8.2", "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-medium-zoom": "^1.1.9",
"vuepress-plugin-zooming": "^1.1.8", "vuepress-plugin-zooming": "^1.1.8",
"vuepress-theme-book": "0.0.6", "vuepress-theme-book": "0.0.6",

10
package.json
View File

@@ -33,7 +33,6 @@
}, },
"license": "CC-BY-NC-SA-4.0", "license": "CC-BY-NC-SA-4.0",
"devDependencies": { "devDependencies": {
<<<<<<< HEAD
"@vuepress/plugin-back-to-top": "^1.8.2", "@vuepress/plugin-back-to-top": "^1.8.2",
"markdown-it-multimd-table": "^4.1.1", "markdown-it-multimd-table": "^4.1.1",
"markdown-link-check": "^3.8.7", "markdown-link-check": "^3.8.7",
@@ -41,15 +40,6 @@
"run-script-os": "^1.1.6", "run-script-os": "^1.1.6",
"spellchecker-cli": "^4.8.0", "spellchecker-cli": "^4.8.0",
"vuepress": "^1.8.2", "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-medium-zoom": "^1.1.9",
"vuepress-plugin-zooming": "^1.1.8", "vuepress-plugin-zooming": "^1.1.8",
"vuepress-theme-book": "0.0.6", "vuepress-theme-book": "0.0.6",