BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve conflicts

This commit is contained in:
Ivan Socolsky 2017-08-11 10:53:33 -03:00
parent e4a234f81c
commit 377a647df4
No known key found for this signature in database
GPG Key ID: FAECE6A05FAA4F56
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/providers/persistence/persistence.spec.ts
View File

@ -1,6 +1,6 @@
import { TestBed, inject } from '@angular/core/testing';
import { PersistenceProvider } from './persistence';
import { IStorage, ISTORAGE, KeyAlreadyExistsError } from './storage/istorage';
import { IStorage, ISTORAGE } from './storage/istorage';
import { RamStorage } from './storage/ram-storage';
import { LocalStorage } from './storage/local-storage';
import { Logger, Level as LoggerLevel } from '@nsalaun/ng-logger';

2
tsconfig.json
View File

@ -25,7 +25,7 @@
},
"types": [
"chrome",
"lodash"
"lodash",
"node"
]
}