Resolve merge conflicts using Webstorm's merge integration tool. v2

2015-04-17 00:39:48 -04:00
parent b49d2fd343
commit b9372b9af6
4 changed files with 6 additions and 35 deletions
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -68,4 +68,4 @@ gulp.task('lint', function() {
  .pipe(eslint.format());
 });

-gulp.task('default', ['lint', 'serve', 'sync']);
+gulp.task('default', ['serve', 'sync']);