diff --git a/package-lock.json b/package-lock.json index f2d7fab..83444e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3992,6 +3992,13 @@ "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", "requires": { "merge": "^1.2.0" + }, + "dependencies": { + "merge": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" + } } }, "execa": { @@ -9274,9 +9281,9 @@ } }, "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==" }, "merge-stream": { "version": "1.0.1", diff --git a/package.json b/package.json index fe2f743..91db135 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "expo-asset": "^5.0.1", "expo-constants": "^5.0.1", "expo-permissions": "^5.0.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "moment": "^2.24.0", "react": "16.13.1", "react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz",