From 4fcd4099ad9c63c934a6c2b9bd44205fb4fb6275 Mon Sep 17 00:00:00 2001 From: aptx4869 Date: Thu, 8 Feb 2018 15:07:29 +0800 Subject: [PATCH] Resolve merge conflict Fixes #1500 --- lib/jasmine-core/jasmine.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/jasmine-core/jasmine.css b/lib/jasmine-core/jasmine.css index 5111cbfe..c6b2fb75 100644 --- a/lib/jasmine-core/jasmine.css +++ b/lib/jasmine-core/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; }