Skip to content

Commit

Permalink
Merge branch 'canary' into update/lint-parallel
Browse files Browse the repository at this point in the history
  • Loading branch information
ijjk committed Nov 27, 2019
2 parents 4e118ce + 6517246 commit 48839f8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"lru-cache": "5.1.1",
"mini-css-extract-plugin": "0.8.0",
"mkdirp": "0.5.1",
"native-url": "0.2.2",
"native-url": "0.2.3",
"node-fetch": "2.6.0",
"object-assign": "4.1.1",
"ora": "3.4.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10647,10 +10647,10 @@ native-or-bluebird@^1.2.0:
resolved "https://registry.yarnpkg.com/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz#39c47bfd7825d1fb9ffad32210ae25daadf101c9"
integrity sha1-OcR7/Xgl0fuf+tMiEK4l2q3xAck=

native-url@0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.2.tgz#a0e1ece7753a17d155068214872e81d7d322b410"
integrity sha512-X4a7YwNjY0ZxWIibqUuILfg7EaV2alawCgRZeczemcyTwOMYz5/zjR6l3nnDLARHl2sLlNbqk2A7ysb0atoYjA==
native-url@0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.3.tgz#29dfc0d7b2b396af493872ccc4b7d974e72ecb9a"
integrity sha512-AeSn0qFkS9EVPExWw/mN8le1HUj09LXovYPBTT9rnr9300OTvz+MZoEzIM1F7iPROsT2UNMzM+UsJCTPDqaL1g==
dependencies:
querystring "^0.2.0"

Expand Down

0 comments on commit 48839f8

Please sign in to comment.