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
@@ -7,7 +7,7 @@ import { Observable } from 'rxjs/Observable';
* @description This plugin enables serial communication over Bluetooth. It was written for communicating between Android or iOS and an Arduino.
* @usage
* ```typescript
* import { BluetoothSerial } from 'ionic-native';
* import { BluetoothSerial } from '@ionic-native/bluetooth-serial';
*
*
* // Write a string