vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: merge conflict

Browse source
This commit is contained in:
Sagar Vora 2020-04-26 20:48:21 +05:30
parent 44b78e7fb2
commit 4d80b592e2
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rollup/config.js
View file

@ -136,13 +136,8 @@ function get_rollup_options_for_css(output_file, input_files) {
path.resolve(bench_path, '**/*.scss'),
path.resolve(bench_path, '**/*.css')
],
<<<<<<< Updated upstream
minimize: minimize_css,
sourceMap: output_file.startsWith('css/') && !production
=======
minimize: starts_with_css && production,
sourceMap: starts_with_css && !production
>>>>>>> Stashed changes
})
];