From 78861caa9d16547bcf7f381b4be0aeada9832813 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 22 Aug 2020 15:57:04 +0200
Subject: [PATCH] Fix build
---
webpack.config.js | 5 -----
1 file changed, 5 deletions(-)
diff --git a/webpack.config.js b/webpack.config.js
index 601e09610..eec4f6583 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -49,15 +49,10 @@ module.exports = environment => {
{
loader: 'sass-loader',
options: {
-<<<<<<< HEAD
- indentedSyntax: false,
- data: "$primaryBackground: " + primaryBackground + '; ' +
-=======
sassOptions: {
indentedSyntax: false
},
additionalData: "$primaryBackground: " + primaryBackground + '; ' +
->>>>>>> Upgrade sass-loader; Closes #1235
"$transitionBackground: " + transitionBackground + "; " +
"$secondaryBackground: " + secondaryBackground + ";"
}
--
GitLab