From d6ed87d7cc1fde91638669b292da9c2a9baa84df Mon Sep 17 00:00:00 2001 From: Ibby Hadeed Date: Wed, 17 May 2017 08:12:36 -0400 Subject: [PATCH] fix merge conflict --- src/@ionic-native/plugins/secure-storage/index.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/@ionic-native/plugins/secure-storage/index.ts b/src/@ionic-native/plugins/secure-storage/index.ts index 9c7fd1204..4407ee8b4 100644 --- a/src/@ionic-native/plugins/secure-storage/index.ts +++ b/src/@ionic-native/plugins/secure-storage/index.ts @@ -120,17 +120,8 @@ export class SecureStorage extends IonicNativePlugin { */ @CordovaCheck() create(store: string): Promise { -<<<<<<< HEAD return new Promise((res: Function, rej: Function) => { const instance = new (SecureStorage.getPlugin())(() => res(new SecureStorageObject(instance)), rej, store); -======= - return new Promise((res, rej) => { - if (checkAvailability('cordova.plugins.SecureStorage', null, 'SecureStorage') === true) { - const instance = new cordova.plugins.SecureStorage(() => res(new SecureStorageObject(instance)), rej, store); - } else { - rej('SecureStorage failure: cordova plugin is not available'); - } ->>>>>>> 5145395dd7bea7d2fb81b11b356a4a7497c607e7 }); }