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:58:43 UTC

[11/17] git commit: resolve merge conflicts

resolve merge conflicts


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

Branch: refs/heads/master
Commit: f3e416db651c510942be085167717bb59281221f
Parents: df374ae 74c05d8
Author: hermwong <he...@gmail.com>
Authored: Wed Nov 6 14:00:30 2013 -0800
Committer: hermwong <he...@gmail.com>
Committed: Wed Nov 6 14:00:30 2013 -0800

----------------------------------------------------------------------
 RELEASENOTES.md | 4 ++++
 plugin.xml      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/blob/f3e416db/plugin.xml
----------------------------------------------------------------------