Skip to content

Commit 8d4ed0b

Browse files
committed
Fixes Merge Conflict
This commit fixes a merge conflict in the project dependency versioning. Signed-off-by: Lui de la Parra <Lui@mutesymphony.com>
1 parent 8a118e5 commit 8d4ed0b

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@
4949
"moment": "^2.24.0",
5050
"object-sizeof": "^1.5.2",
5151
"prettysize": "^2.0.0",
52-
<<<<<<< Updated upstream
53-
"snyk": "^1.258.2",
54-
=======
5552
"snyk": "^1.260.0",
56-
>>>>>>> Stashed changes
5753
"stream-to-array": "^2.3.0",
5854
"tough-cookie": "^3.0.1",
5955
"uuid": "^3.3.3"

0 commit comments

Comments
 (0)