Skip to content

Commit

Permalink
chore: conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaszjedrasik committed Mar 2, 2021
1 parent 788663f commit b19cd0a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/boilerplate/theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "jest"
},
"dependencies": {
"@storefront-ui/vue": "^0.10.2",
"@storefront-ui/vue": "^0.10.3",
"@vue-storefront/boilerplate": "0.0.1",
"@vue-storefront/nuxt": "^2.2.1",
"@vue-storefront/nuxt-theme": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/commercetools/theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"dependencies": {
"@nuxtjs/pwa": "^3.2.2",
"@storefront-ui/vue": "0.10.2",
"@storefront-ui/vue": "0.10.3",
"@vue-storefront/commercetools": "^1.1.2",
"@vue-storefront/nuxt": "^2.2.1",
"@vue-storefront/nuxt-theme": "^2.2.1",
Expand Down
1 change: 1 addition & 0 deletions packages/core/nuxt-theme-module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
},
"dependencies": {
"lodash.merge": "^4.6.2",
"lodash.debounce": "^4.0.8",
"vue-lazy-hydration": "^2.0.0-beta.4"
},
"publishConfig": {
Expand Down

0 comments on commit b19cd0a

Please sign in to comment.