diff --git a/package-lock.json b/package-lock.json index ec52647..48dfaf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5773,9 +5773,9 @@ "dev": true }, "merge": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", - "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz", + "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==", "dev": true }, "merge-source-map": { diff --git a/package.json b/package.json index 6c915b6..4f69326 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@types/socket.io-client": "1.4.32", "envify": "4.1.0", "jest": "24.9.0", - "merge": "1.2.1", + "merge": "2.1.1", "parcel-bundler": "1.12.4", "ts-jest": "24.1.0", "tslint": "5.20.0",