fix PR conflict

This commit is contained in:
0dp 2018-06-26 10:17:34 +02:00
parent b32d6bae16
commit 0056613ae0
9 changed files with 4 additions and 36 deletions

BIN
css/.DS_Store vendored

Binary file not shown.

10
css/fsgtheme.min.css vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -12,7 +12,8 @@ var autoprefixer = require( 'autoprefixer' ),
sass = require( 'gulp-sass' ),
sourcemaps = require( 'gulp-sourcemaps' ),
uglify = require( 'gulp-uglify' ),
rev = require('gulp-rev');
rev = require('gulp-rev'),
revDel = require('rev-del');
// Configuration file to keep your code DRY
@ -193,6 +194,7 @@ gulp.task( 'revision', function(done) {
.pipe(rev())
.pipe(gulp.dest('./')) // write rev'd assets to build dir
.pipe(rev.manifest())
.pipe(revDel({dest: './'}))
.pipe(gulp.dest('./')); // write manifest to build dir
done();

BIN
js/.DS_Store vendored

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -46,6 +46,7 @@
"gulp-watch": "5.0.0",
"merge2": "^1.2.1",
"popper.js": "^1.14.1",
"rev-del": "1.0.5",
"undescores-for-npm": "^1.0.0"
}
}

View File

@ -1,4 +0,0 @@
{
"css/theme.min.css": "css/theme-7a3aa37604.min.css",
"js/theme.min.js": "js/theme-e677a2ace8.min.js"
}