resolve merge conflict

2026-04-13 00:00:10 +08:00 · 2017-02-16 19:49:25 -05:00
parent de51746bfc 822a4120c7
commit a2e410c4cb
127 changed files with 442 additions and 128 deletions
@@ -11,7 +11,7 @@ declare var window;
 * For usage information please refer to the plugin's Github repo.
 *
 * ```typescript
- * import {WebIntent} from 'ionic-native';
+ * import {WebIntent} from '@ionic-native/web-intent';
 *
 * WebIntent.startActivity(options).then(onSuccess, onError);
 *