fix: conflicts

This commit is contained in:
Rucha Mahabal
2020-02-27 13:16:53 +05:30
parent e29d5c1d5b
commit 99321cd538
444 changed files with 15057 additions and 10826 deletions

8
.snyk Normal file
View File

@@ -0,0 +1,8 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.14.0
ignore: {}
# patches apply the minimum changes required to fix a vulnerability
patch:
SNYK-JS-LODASH-450202:
- cypress > getos > async > lodash:
patched: '2020-01-31T01:35:12.802Z'