From c85f28f8ea908431169e855a1fac54d29bf0163e Mon Sep 17 00:00:00 2001
From: Eymen Elkum <eymen.elkum@gmail.com>
Date: Mon, 20 Jun 2022 11:49:39 +0300
Subject: [PATCH] fix merge conflict (#2349)

---
 frontend/test/jasmine/jasmine.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/test/jasmine/jasmine.css b/frontend/test/jasmine/jasmine.css
index 5111cbfeae..c6b2fb7569 100644
--- a/frontend/test/jasmine/jasmine.css
+++ b/frontend/test/jasmine/jasmine.css
@@ -33,13 +33,8 @@ body { overflow-y: scroll; }
 .jasmine_html-reporter .jasmine-bar.jasmine-passed { background-color: #007069; }
 .jasmine_html-reporter .jasmine-bar.jasmine-incomplete { background-color: #bababa; }
 .jasmine_html-reporter .jasmine-bar.jasmine-skipped { background-color: #bababa; }
-<<<<<<< HEAD
-||||||| merged common ancestors
-.jasmine_html-reporter .jasmine-bar.jasmine-errored { background-color: #ca3a11; }
-=======
 .jasmine_html-reporter .jasmine-bar.jasmine-errored { background-color: #ca3a11; }
 .jasmine_html-reporter .jasmine-bar.jasmine-warning { background-color: #ba9d37; color: #333; }
->>>>>>> master
 .jasmine_html-reporter .jasmine-bar.jasmine-menu { background-color: #fff; color: #aaa; }
 .jasmine_html-reporter .jasmine-bar.jasmine-menu a { color: #333; }
 .jasmine_html-reporter .jasmine-bar a { color: white; }