From 88e367049323e67a24ba0260de25d9a6af9d7838 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Wed, 6 Mar 2019 07:30:34 +0100 Subject: [PATCH] fix merge module in package.json --- app/package-lock.json | 10 +++++----- app/package.json | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 2a53839..e3cca76 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -4060,8 +4060,8 @@ } }, "lbry-redux": { - "version": "github:lbryio/lbry-redux#3ab065b11a52d3e2e6a50a25459f9ff0aac03b13", - "from": "github:lbryio/lbry-redux", + "version": "github:lbryio/lbry-redux#b9554f9fbe2c8ecf29d63ed07e5d5d93aeb4d141", + "from": "github:lbryio/lbry-redux#old-search", "requires": { "proxy-polyfill": "0.1.6", "reselect": "^3.0.0", @@ -4281,9 +4281,9 @@ } }, "merge": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", - "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" }, "merge-stream": { "version": "1.0.1", diff --git a/app/package.json b/app/package.json index 49b2d78..ee49398 100644 --- a/app/package.json +++ b/app/package.json @@ -10,6 +10,7 @@ "@expo/vector-icons": "^8.1.0", "lbry-redux": "lbryio/lbry-redux#old-search", "lbryinc": "lbryio/lbryinc", + "merge": ">=1.2.1", "moment": "^2.22.1", "react": "16.2.0", "react-native": "0.55.3",