diff options
| author | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2019-11-28 11:19:03 +0100 |
|---|---|---|
| committer | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2019-11-28 11:19:03 +0100 |
| commit | 399ddd7e7d9f1105657aa65ddf82c4c0199ffe7f (patch) | |
| tree | ca05430dd574cfa0f85e6b0160921c5ca2630fc2 /package.json | |
| parent | 7051b88fd36e56dcfab7b73b80811c93bc1d0921 (diff) | |
| download | puszcza-399ddd7e7d9f1105657aa65ddf82c4c0199ffe7f.tar.gz puszcza-399ddd7e7d9f1105657aa65ddf82c4c0199ffe7f.zip | |
Fix conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/package.json b/package.json index 4776e69..f315b62 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,8 @@ }, "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", + "@nuxtjs/markdownit": "^1.2.7", "esm": "^3.2.25", "front-matter": "^3.0.2", "jsdom": "^15.1.1", @@ -27,7 +23,6 @@ "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", |