diff options
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/package.json b/package.json index e6ceb92..4776e69 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,11 @@ }, "dependencies": { "@nuxtjs/axios": "^5.3.6", +<<<<<<< HEAD + "@nuxtjs/markdownit": "^1.2.7", + "@nuxtjs/pwa": "^3.0.0-0", + "nuxt": "^2.0.0" +======= "@nuxtjs/pwa": "^3.0.0-0", "esm": "^3.2.25", "front-matter": "^3.0.2", @@ -22,6 +27,7 @@ "markdown-it": "^10.0.0", "nuxt": "^2.0.0", "raw-loader": "^3.1.0" +>>>>>>> origin/develop }, "devDependencies": { "@vue/test-utils": "^1.0.0-beta.27", |