public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00
Code Issues Releases Wiki Activity

Fix conflict of yarn.lock

Browse Source
This commit is contained in:
kawmra
2018-06-02 22:59:49 +09:00
parent e4d4041c6b
commit 03293c0d25
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yarn.lock
View File

@@ -2777,11 +2777,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: