Skip to content
Snippets Groups Projects
Commit 78861caa authored by Tim van Dijen's avatar Tim van Dijen
Browse files

Fix build

parent 3d747dbd
Branches
Tags
No related merge requests found
...@@ -49,15 +49,10 @@ module.exports = environment => { ...@@ -49,15 +49,10 @@ module.exports = environment => {
{ {
loader: 'sass-loader', loader: 'sass-loader',
options: { options: {
<<<<<<< HEAD
indentedSyntax: false,
data: "$primaryBackground: " + primaryBackground + '; ' +
=======
sassOptions: { sassOptions: {
indentedSyntax: false indentedSyntax: false
}, },
additionalData: "$primaryBackground: " + primaryBackground + '; ' + additionalData: "$primaryBackground: " + primaryBackground + '; ' +
>>>>>>> Upgrade sass-loader; Closes #1235
"$transitionBackground: " + transitionBackground + "; " + "$transitionBackground: " + transitionBackground + "; " +
"$secondaryBackground: " + secondaryBackground + ";" "$secondaryBackground: " + secondaryBackground + ";"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment