You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2014/05/16 21:54:15 UTC
[3/3] git commit: CB-6709 Remove merges/ folder for default apps
CB-6709 Remove merges/ folder for default apps
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b3a0b3a7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b3a0b3a7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b3a0b3a7
Branch: refs/heads/master
Commit: b3a0b3a7c77e6ef5312b1797e23f1656a8e79989
Parents: 4fb7e47
Author: Michal Mocny <mm...@gmail.com>
Authored: Fri May 16 15:53:03 2014 -0400
Committer: Michal Mocny <mm...@gmail.com>
Committed: Fri May 16 15:53:03 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/cordova/create.js | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b3a0b3a7/cordova-lib/src/cordova/create.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/create.js b/cordova-lib/src/cordova/create.js
index 1e996a2..f721901 100644
--- a/cordova-lib/src/cordova/create.js
+++ b/cordova-lib/src/cordova/create.js
@@ -197,9 +197,6 @@ function create(dir, id, name, cfg) {
// Create basic project structure.
shell.mkdir(path.join(dir, 'platforms'));
- if ( !custom_merges) {
- shell.mkdir(path.join(dir, 'merges'));
- }
shell.mkdir(path.join(dir, 'plugins'));
shell.mkdir(path.join(dir, 'hooks'));