rayelliott
/
understrap
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing merge conflict in gulpfile

This commit is contained in:
koenemann 2016-01-18 14:25:55 +01:00
parent 92f47a0759
commit 7b08152a12
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gulpfile.js
View File

@ -48,20 +48,23 @@ gulp.task('cleancss', function() {
gulp.task('copy-assets', function() { gulp.task('copy-assets', function() {
gulp.src(basePaths.bower + 'bootstrap-sass/assets/javascripts/*.js') gulp.src(basePaths.bower + 'bootstrap-sass/assets/javascripts/*.js')
.pipe(gulp.dest('./js')); .pipe(gulp.dest('./js'));
<<<<<<< HEAD
gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/*.scss') gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/*.scss')
=======
gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/**/*.scss') gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/**/*.scss')
>>>>>>> master
.pipe(gulp.dest('./sass/bootstrap-sass')); .pipe(gulp.dest('./sass/bootstrap-sass'));
gulp.src(basePaths.bower + 'bootstrap-sass/assets/fonts/bootstrap/*.{ttf,woff,woff2,eof,svg}') gulp.src(basePaths.bower + 'bootstrap-sass/assets/fonts/bootstrap/*.{ttf,woff,woff2,eof,svg}')
.pipe(gulp.dest('./fonts')); .pipe(gulp.dest('./fonts'));
gulp.src(basePaths.bower + 'fontawesome/fonts/**/*.{ttf,woff,woff2,eof,svg}') gulp.src(basePaths.bower + 'fontawesome/fonts/**/*.{ttf,woff,woff2,eof,svg}')
.pipe(gulp.dest('./fonts')); .pipe(gulp.dest('./fonts'));
gulp.src(basePaths.bower + 'fontawesome/scss/*.scss') gulp.src(basePaths.bower + 'fontawesome/scss/*.scss')
.pipe(gulp.dest('./sass/fontawesome')); .pipe(gulp.dest('./sass/fontawesome'));
gulp.src(basePaths.bower + 'jquery/dist/*.js') gulp.src(basePaths.bower + 'jquery/dist/*.js')
.pipe(gulp.dest('./js')); .pipe(gulp.dest('./js'));
gulp.src(basePaths.bower + '_s/js/*.js') gulp.src(basePaths.bower + '_s/js/*.js')
.pipe(gulp.dest('./js')); .pipe(gulp.dest('./js'));
}); });