resolve merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/61570afa Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/61570afa Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/61570afa Branch: refs/heads/2.9.x Commit: 61570afa77815dce0ff2d223c3dd897f431a3e71 Parents: 90097ba Author: Andrew Grieve <[email protected]> Authored: Tue Jun 18 13:54:41 2013 -0400 Committer: Jesse MacFadyen <[email protected]> Committed: Tue Jun 18 16:18:14 2013 -0700 ---------------------------------------------------------------------- common/www/cordova.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/61570afa/common/www/cordova.js ---------------------------------------------------------------------- diff --git a/common/www/cordova.js b/common/www/cordova.js index 3e70492..9d8d7a6 100644 --- a/common/www/cordova.js +++ b/common/www/cordova.js @@ -6717,4 +6717,6 @@ window.cordova = require('cordova'); } catch(err){ finishPluginLoading(); } -}(window)); \ No newline at end of file +}(window)); + +})();
