diff options
| author | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-05-22 11:28:57 -0500 |
|---|---|---|
| committer | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-05-22 11:28:57 -0500 |
| commit | 6d2ac59c27da5bee9f951f027768015ee0b27f42 (patch) | |
| tree | de6c02a5c60ddc9e067bddfb8e46680acaf29ec3 | |
| parent | 2fa84b20fa657835510cb9be876817845d3df61b (diff) | |
fixed merge conflict
| -rw-r--r-- | package-lock.json | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/package-lock.json b/package-lock.json index 0439d7363..2a9e33a28 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14400,9 +14400,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", -<<<<<<< HEAD - -======= "dev": true, "requires": { "resolve-from": "^3.0.0" @@ -17959,5 +17956,4 @@ } } } -} ->>>>>>> fdbff9dbb60b4af8f6feba67feda5376263dd7ca +}
\ No newline at end of file |