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
+1 -1
View File
@@ -90,7 +90,7 @@ export interface AdMobAdExtras {
* Plugin for Google Ads, including AdMob / DFP (doubleclick for publisher) and mediations to other Ad networks.
* @usage
* ```typescript
* import { AdMob } from 'ionic-native';
* import { AdMob } from '@ionic-native/ad-mob';
*
* ionViewDidLoad() {
* AdMob.onAdDismiss()