From 4d80b592e29d21ad383b579f09909cdf6ca20762 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sun, 26 Apr 2020 20:48:21 +0530
Subject: [PATCH] fix: merge conflict

---
 rollup/config.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/rollup/config.js b/rollup/config.js
index e4dbdc6053..a88b966916 100644
--- a/rollup/config.js
+++ b/rollup/config.js
@@ -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
 		})
 	];