You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cordova.apache.org by pu...@apache.org on 2014/08/07 21:09:48 UTC

[10/10] git commit: fix merge issue

fix merge issue


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/commit/241ee974
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/241ee974
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/241ee974

Branch: refs/heads/master
Commit: 241ee974c5fc63fde3633fa18fd70c6078b6a9c5
Parents: 18f6f89 e837e80
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Aug 7 12:09:07 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Aug 7 12:09:07 2014 -0700

----------------------------------------------------------------------
 plugin.xml       |   4 +-
 tests/plugin.xml |  31 ++++
 tests/tests.js   | 475 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 507 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/241ee974/plugin.xml
----------------------------------------------------------------------