1
0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00

resolve merge conflicts

This commit is contained in:
Sebastian Gerske 2018-10-26 10:57:40 +02:00
parent 300918e687
commit 33b642c2c3

View File

@ -15,7 +15,7 @@ export default class Ocean {
public static async getInstance(config: Config) {
if (!Ocean.instance) {
ConfigProvider.setConfig(config)
ConfigProvider.configure(config)
SecretStoreProvider.configure(config)
AquariusProvider.setAquarius(Aquarius)
Ocean.instance = new Ocean(await Keeper.getInstance())