Skip to content

Commit c18bb62

Browse files
committed
Remove merge2 package since it is no longer used.
1 parent d9a323e commit c18bb62

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

gulpfile.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ var ghPages = require('gulp-gh-pages'),
1212
fs = require('fs'),
1313
del = require('del'),
1414
moment = require('moment'),
15-
merge = require('merge2'),
1615
karma = require('karma'),
1716
typedoc = require('gulp-typedoc'),
1817
webpack = require('webpack');

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
"karma-jasmine": "^0.3.7",
5959
"karma-phantomjs-launcher": "^1.0.0",
6060
"karma-spec-reporter": "0.0.23",
61-
"merge2": "^1.0.1",
6261
"moment": "^2.14.1",
6362
"phantomjs-prebuilt": "^2.1.3",
6463
"run-sequence": "^1.1.5",

0 commit comments

Comments
 (0)