Resolve conflicts

leo · leo · commit c748d0214f64 · 2016-02-19T10:33:03.000+01:00
diff --git a/src/blackList.json b/src/blackList.json
@@ -277,5 +277,6 @@
   "gulp-babel-transpiler": "duplicate of gulp-babel",
   "gulp-uglifyjs-wrapper": "duplicate of gulp-uglify",
   "gulp-rollup": "use the `rollup` module directly",
-  "gulp-livereload": "abandoned. use gulp-refresh"
+  "gulp-livereload": "abandoned. use gulp-refresh",
+  "gulp-minify-css": "deprecated. use gulp-cssnano."
 }

Original file line number	Diff line number	Diff line change
`@@ -277,5 +277,6 @@`
`277`	`277`	`"gulp-babel-transpiler": "duplicate of gulp-babel",`
`278`	`278`	`"gulp-uglifyjs-wrapper": "duplicate of gulp-uglify",`
`279`	`279`	"gulp-rollup": "use the `rollup` module directly",
`280`		`- "gulp-livereload": "abandoned. use gulp-refresh"`
	`280`	`+ "gulp-livereload": "abandoned. use gulp-refresh",`
	`281`	`+ "gulp-minify-css": "deprecated. use gulp-cssnano."`
`281`	`282`	`}`