diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-15 17:05:03 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-15 17:05:03 +0530 |
| commit | 5c6d76f1c7836d8e9f43707384ee2daa74f1565f (patch) | |
| tree | 5f3fdd9a0de0e94eb9797e08b1461804f6a1c9fa /package-lock.json | |
| parent | 9c2410571d08674477eced80419585ebd15faaf0 (diff) | |
| parent | 07d71ea914c5bae3136b6c911c38b3373afcd5a7 (diff) | |
fixed merge conflicts
Diffstat (limited to 'package-lock.json')
| -rw-r--r-- | package-lock.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/package-lock.json b/package-lock.json index ad181758c..1b39905cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14256,6 +14256,11 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, + "react-loading": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/react-loading/-/react-loading-2.0.3.tgz", + "integrity": "sha512-Vdqy79zq+bpeWJqC+xjltUjuGApyoItPgL0vgVfcJHhqwU7bAMKzysfGW/ADu6i0z0JiOCRJjo+IkFNkRNbA3A==" + }, "react-measure": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/react-measure/-/react-measure-2.3.0.tgz", |