You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by lo...@apache.org on 2014/08/21 20:23:12 UTC
[11/15] git commit: removed merge conflict
removed merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/a4d941ff
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/a4d941ff
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/a4d941ff
Branch: refs/heads/master
Commit: a4d941ffaed9f58509cf35f082f466ef474d52c0
Parents: 54f090f
Author: Lorin Beer <lo...@gmail.com>
Authored: Wed Aug 20 12:04:29 2014 -0700
Committer: Lorin Beer <lo...@gmail.com>
Committed: Wed Aug 20 12:04:29 2014 -0700
----------------------------------------------------------------------
src/cli.js | 16 +++++++---------
src/create.js | 1 -
2 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/a4d941ff/src/cli.js
----------------------------------------------------------------------
diff --git a/src/cli.js b/src/cli.js
index 2b3de8e..402aefb 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -28,6 +28,13 @@ var path = require('path'),
nopt,
_;
+var cordova_lib = require('cordova-lib'),
+ CordovaError = cordova_lib.CordovaError,
+ cordova = cordova_lib.cordova,
+ plugman = cordova_lib.plugman,
+ events = cordova_lib.events;
+
+
/*
* init
*
@@ -125,11 +132,6 @@ function cli(inputArgs) {
return;
}
- var cordova_lib = require('cordova-lib'),
- CordovaError = cordova_lib.CordovaError,
- cordova = cordova_lib.cordova,
- events = cordova_lib.events;
-
// For CordovaError print only the message without stack trace unless we
// are in a verbose mode.
@@ -247,11 +249,7 @@ function cli(inputArgs) {
cordova.raw[cmd].call(null, opts).done();
} else if (cmd == 'serve') {
-<<<<<<< HEAD
- var port = undashed[1];
-=======
var port = undashed[1]
->>>>>>> be1e82d... updated tests and cli to pass all tests
cordova.raw.serve(port).done();
} else if (cmd == 'create') {
var cfg = {};
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/a4d941ff/src/create.js
----------------------------------------------------------------------
diff --git a/src/create.js b/src/create.js
index 661549b..f3efa3c 100644
--- a/src/create.js
+++ b/src/create.js
@@ -27,7 +27,6 @@ CordovaCliCreate.prototype.run = function (args, undashed) {
, undashed[3] // App name
, cfg
).done();
-
};
/**