LBRYCommunity/lbry-fdroid
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

fix merge module in package.json

Browse source
This commit is contained in:
Akinwale Ariwodola 2019-03-06 07:30:34 +01:00
parent eceeed8290
commit 88e3670493
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/package-lock.json generated
View file

@ -4060,8 +4060,8 @@
} }
}, },
"lbry-redux": { "lbry-redux": {
"version": "github:lbryio/lbry-redux#3ab065b11a52d3e2e6a50a25459f9ff0aac03b13", "version": "github:lbryio/lbry-redux#b9554f9fbe2c8ecf29d63ed07e5d5d93aeb4d141",
"from": "github:lbryio/lbry-redux", "from": "github:lbryio/lbry-redux#old-search",
"requires": { "requires": {
"proxy-polyfill": "0.1.6", "proxy-polyfill": "0.1.6",
"reselect": "^3.0.0", "reselect": "^3.0.0",
@ -4281,9 +4281,9 @@
} }
}, },
"merge": { "merge": {
"version": "1.2.0", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
"integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=" "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
}, },
"merge-stream": { "merge-stream": {
"version": "1.0.1", "version": "1.0.1",

1
app/package.json
View file

@ -10,6 +10,7 @@
"@expo/vector-icons": "^8.1.0", "@expo/vector-icons": "^8.1.0",
"lbry-redux": "lbryio/lbry-redux#old-search", "lbry-redux": "lbryio/lbry-redux#old-search",
"lbryinc": "lbryio/lbryinc", "lbryinc": "lbryio/lbryinc",
"merge": ">=1.2.1",
"moment": "^2.22.1", "moment": "^2.22.1",
"react": "16.2.0", "react": "16.2.0",
"react-native": "0.55.3", "react-native": "0.55.3",