Merge remote-tracking branch 'origin/master'

# Conflicts: # test/simpleTest.js
webpack-contrib · May 2, 2018 · 50f8ec0 · 50f8ec0
2 parents 07444ad + 3de8aa7
commit 50f8ec0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/test/simpleTest.js b/test/simpleTest.js
@@ -38,9 +38,9 @@ describe("simple", function() {
 	test("charset directive", "@charset \"UTF-8\";\n .class { a: b c d; }", [
 		[1, "@charset \"UTF-8\";\n .class { a: b c d; }", ""]
 	]);
-	test("custom variables", ":root {--foo: 1px;\n--bar: 2px;}", [
-		[1, ":root {--foo: 1px;\n--bar: 2px;}", ""]
-	]);
+  test("custom variables", ":root {--foo: 1px;\n--bar: 2px;}", [
+    [1, ":root {--foo: 1px;\n--bar: 2px;}", ""]
+  ]);
 	testError("error formatting", ".some {\n invalid css;\n}", function(err) {
 		assert.equal(err.message, [
 			'Unknown word (2:2)',