diff options
| -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 |