fix conflict

This commit is contained in:
haythem 2019-05-16 13:53:16 +01:00
commit 1deb726cf1

View File

@ -60,8 +60,7 @@
"dependencies": {
"ethers": "^4.0.27",
"ipfs-http-client": "^30.1.1",
"kosmos-schemas": "^2.0.0",
"rsvp": "^4.8.2",
"kosmos-schemas": "^2.1.0",
"tv4": "^1.3.0"
},
"keywords": [