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

Posted to commits@cordova.apache.org by st...@apache.org on 2013/12/05 01:56:49 UTC

[13/28] git commit: fix merger conflicts

fix merger conflicts


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/c070a4fe
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/c070a4fe
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/c070a4fe

Branch: refs/heads/master
Commit: c070a4fe671ebb20bb118fe57d21b5cf1b825196
Parents: 7720e9d 85c4030
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Dec 3 11:15:58 2013 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Dec 3 11:15:58 2013 -0800

----------------------------------------------------------------------
 src/wp/Contacts.cs | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)
----------------------------------------------------------------------