Skip to content

Commit

Permalink
Merge pull request gulpjs#367 from steida/master
Browse files Browse the repository at this point in the history
Rename concat to merge.
  • Loading branch information
yocontra committed Mar 22, 2014
2 parents 022ef6c + 8ae99c0 commit f6b6c87
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/recipes/using-multiple-sources-in-one-task.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var gulp = require('gulp');
var es = require('event-stream');

gulp.task('test', function(cb) {
return es.concat(
return es.merge(
gulp.src('bootstrap/js/*.js')
.pipe(gulp.dest('public/bootstrap')),
gulp.src('jquery.cookie/jquery.cookie.js')
Expand Down

0 comments on commit f6b6c87

Please sign in to comment.