Resolved 2.x merge conflicts

# By Vincent Prouillet
# Via Vincent Prouillet
* '2.x' of github.com:Snugug/gulp-sass:
  Use plugin name const in logError

# Conflicts:
#	index.js
This commit is contained in:
Sam Richard 2015-03-26 19:55:20 -04:00
commit 7a2f8ac259

View file

@ -91,7 +91,7 @@ gulpSass.sync = function sync(options) {
// Log errors nicely // Log errors nicely
////////////////////////////// //////////////////////////////
gulpSass.logError = function logError(error) { gulpSass.logError = function logError(error) {
gutil.log(gutil.colors.red('[gulp-sass] ') + error.message); gutil.log(gutil.colors.red('[' + PLUGIN_NAME + '] ') + error.message);
}; };
module.exports = gulpSass; module.exports = gulpSass;