Skip to content

Commit 860e37c

Browse files
committed
Conflicts: src/paypal-button.js
2 parents 43c847a + 86bee17 commit 860e37c

6 files changed

Lines changed: 3 additions & 23 deletions

File tree

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

Gruntfile.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ module.exports = function (grunt) {
2727
options: {
2828
banner: "<%= meta.banner %>"
2929
}
30-
},
31-
bundled: {
32-
src: [ "<%= meta.banner %>", "lib/MiniCart/src/minicart.js", "src/paypal-button.js" ],
33-
dest: "dist/paypal-button-minicart.min.js",
34-
options: {
35-
banner: "<%= meta.banner %>"
36-
}
3730
}
3831
},
3932

@@ -51,9 +44,8 @@ module.exports = function (grunt) {
5144
grunt.loadNpmTasks("grunt-contrib-jshint");
5245
grunt.loadNpmTasks("grunt-contrib-uglify");
5346
grunt.loadNpmTasks("grunt-mocha-test");
54-
grunt.loadNpmTasks("grunt-update-submodules");
5547

56-
grunt.registerTask("default", ["jshint", "update_submodules", "uglify"]);
48+
grunt.registerTask("default", ["jshint", "uglify"]);
5749
grunt.registerTask("test", ["jshint", "mochaTest"]);
5850

5951
};

dist/paypal-button-minicart.min.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

dist/paypal-button.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/MiniCart

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"grunt": "~0.4.2",
3838
"grunt-contrib-jshint": "~0.8.0",
3939
"grunt-contrib-uglify": "~0.2.7",
40-
"grunt-update-submodules": "~0.2.1",
4140
"grunt-mocha-test": "~0.7.0",
4241
"jsdom": "~0.8.10",
4342
"mocha": "~1.13.0",

0 commit comments

Comments
 (0)