GitHub user alsorokin opened a pull request:
https://github.com/apache/cordova-plugin-device/pull/43
CB-9847 Fixed merge error of 408c3a20be976ca5b814c9f161c31d4edf1c00fc
https://issues.apache.org/jira/browse/CB-9847
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/MSOpenTech/cordova-plugin-device CB-9847
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cordova-plugin-device/pull/43.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #43
----
commit 36dbfa982423d28ab069676e41417f32d8b60482
Author: Alexander Sorokin <[email protected]>
Date: 2015-10-27T15:16:04Z
CB-9847 Fixed merge error of 408c3a20be976ca5b814c9f161c31d4edf1c00fc
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]