Fix rebase

jantimon · Jun 29, 2015 · 9e313ef · 9e313ef
1 parent a5b1019
commit 9e313ef
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/spec/HtmlWebpackPluginSpec.js b/spec/HtmlWebpackPluginSpec.js
@@ -24,14 +24,11 @@ function testHtmlPlugin(webpackConfig, expectedResults, outputFile, done, expect
     } else {
       expect(compilationWarnings).toBe('');
     }
-<<<<<<< HEAD
-=======
     var outputFileExists = fs.existsSync(path.join(OUTPUT_DIR, outputFile));
     expect(outputFileExists).toBe(true);
     if(!outputFileExists) {
       return done();
-    }    
->>>>>>> Fix chunk filtering
+    }
     var htmlContent = fs.readFileSync(path.join(OUTPUT_DIR, outputFile)).toString();
 
     for (var i = 0; i < expectedResults.length; i++) {