Merge pull request BoostIO#2024 from kawmra/fix-yarn-lock

Fix yarn.lock file
zhouxiaoxiaoxujian · Jun 6, 2018 · eda4e46 · eda4e46
2 parents 91a95b7 + 30378ee
commit eda4e46
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -2381,12 +2381,6 @@ doctrine@^2.0.0, doctrine@^2.0.2:
   dependencies:
     esutils "^2.0.2"
 
-doctrine@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  dependencies:
-    esutils "^2.0.2"
-
 dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
@@ -2776,11 +2770,7 @@ eslint-plugin-promise@~3.4.0:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122"
 
-<<<<<<< HEAD
 eslint-plugin-react@^7.8.2:
-=======
-eslint-plugin-react@^7.2.0:
->>>>>>> ca0b03e97ce59824c9730f08c15590c5f31ebfb0
   version "7.8.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz#e95c9c47fece55d2303d1a67c9d01b930b88a51d"
   dependencies: