wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-07 13:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

updated yarn.lock after merge conflict

Browse Source
This commit is contained in:
Wyatt Johnson
2018-02-23 13:58:42 -07:00
parent 12a1ed0de3
commit 37dc3a27dc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yarn.lock
+9 -1
View File
@@ -5595,7 +5595,7 @@ jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
jsdom@^11.5.1:
jsdom@^11.3.0, jsdom@^11.5.1, jsdom@^11.6.2:
version "11.6.2"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.6.2.tgz#25d1ef332d48adf77fc5221fe2619967923f16bb"
dependencies:
@@ -5934,6 +5934,14 @@ linkify-it@^2.0.3:
dependencies:
uc.micro "^1.0.1"
linkifyjs@^2.1.5:
version "2.1.5"
resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.5.tgz#effc9f01e4aeafbbdbef21a45feab38b9516f93e"
optionalDependencies:
jquery ">=1.9.0"
react ">=0.14.0"
react-dom ">=0.14.0"
lint-staged@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.0.0.tgz#57926c63201e7bd38ca0576d74391efa699b4a9d"