get rid of some stuff from a bad rebase

This commit is contained in:
Rohit Grover 2015-05-20 09:39:04 +01:00
parent f89fcb3ec2
commit 564c53db53

View file

@ -853,16 +853,6 @@ BLEDevice::stopScan(void) {
return transport->getGap().stopScan();
}
inline ble_error_t
BLEDevice::startScanning(Gap::AdvertisementReportCallback_t callback) {
return transport->getGap().startScanning(scanningParams, callback);
}
inline ble_error_t
BLEDevice::stopScanning(void) {
return transport->getGap().stopScanning();
}
inline ble_error_t
BLEDevice::disconnect(Gap::DisconnectionReason_t reason)
{