resolve merge conflict

This commit is contained in:
Ibby
2017-02-16 19:49:25 -05:00
127 changed files with 442 additions and 128 deletions
@@ -53,7 +53,7 @@ export class SecureStorageObject {
* @usage
*
* ```typescript
* import { SecureStorage } from 'ionic-native';
* import { SecureStorage } from '@ionic-native/secure-storage';
*
* let secureStorage: SecureStorage = new SecureStorage();
* secureStorage.create('my_store_name')