From 37dc3a27dcfc64290830e176f2f487f2f64260f4 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Fri, 23 Feb 2018 13:58:42 -0700 Subject: [PATCH] updated yarn.lock after merge conflict --- yarn.lock | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 103ce1d54..cdf07560c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"