mirror of
https://github.com/oceanprotocol-archive/squid-js.git
synced 2024-02-02 15:31:51 +01:00
fix conflict
This commit is contained in:
parent
e7872666fa
commit
6c43a72474
@ -1,8 +1,16 @@
|
|||||||
import { assert } from 'chai'
|
import { assert } from 'chai'
|
||||||
|
|
||||||
import { config } from '../config'
|
import { config } from '../config'
|
||||||
import { Ocean, Account, DDO, MetaData, ComputeJobStatus, Config } from '../../../src'
|
import {
|
||||||
import { getMetadata } from '../utils'
|
Ocean,
|
||||||
|
Account,
|
||||||
|
DDO,
|
||||||
|
MetaData,
|
||||||
|
ComputeJobStatus,
|
||||||
|
Config,
|
||||||
|
MetaDataAlgorithm
|
||||||
|
} from '../../../src'
|
||||||
|
import { getMetadata, createComputeService } from '../utils'
|
||||||
import { ServiceCompute } from '../../../src/ddo/Service'
|
import { ServiceCompute } from '../../../src/ddo/Service'
|
||||||
|
|
||||||
const metadataAsset = getMetadata()
|
const metadataAsset = getMetadata()
|
||||||
|
Loading…
Reference in New Issue
Block a user