From a8677988bd10b8e1ab6dc1bae4ce63d010ad860d Mon Sep 17 00:00:00 2001
From: Jan Nicklas <j.nicklas@sinnerschrader.com>
Date: Mon, 29 Jun 2015 16:08:54 +0200
Subject: [PATCH] Fix rebase

---
 spec/HtmlWebpackPluginSpec.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spec/HtmlWebpackPluginSpec.js b/spec/HtmlWebpackPluginSpec.js
index 123cfae..d80f35e 100644
--- 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++) {