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
@@ -8,7 +8,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
*
* @usage
* ```typescript
* import { NativeStorage } from 'ionic-native';
* import { NativeStorage } from '@ionic-native/native-storage';
*
* NativeStorage.setItem('myitem', {property: 'value', anotherProperty: 'anotherValue'})
* .then(