From 9bf7eaa3a0c6654945ab940f37bf73870f0fd13d Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Fri, 13 Oct 2023 12:20:29 +0200 Subject: [PATCH] test: fix leftover comment during conflict resolution --- cypress/integration/options/legend.cy.js | 1 - 1 file changed, 1 deletion(-) diff --git a/cypress/integration/options/legend.cy.js b/cypress/integration/options/legend.cy.js index da5e0ee022..ba62e3bd37 100644 --- a/cypress/integration/options/legend.cy.js +++ b/cypress/integration/options/legend.cy.js @@ -311,7 +311,6 @@ describe('Options - Legend', () => { expectSingleValueToHaveBackgroundColor(EXPECTED_BACKGROUND_COLOR_1) expectSVTitleToHaveColor(EXPECTED_CUSTOM_TITLE_COLOR) expectSVSubtitleToHaveColor(EXPECTED_CUSTOM_SUBTITLE_COLOR) ->>>>>>> 18ad584a (feat: single value background color change based upon legend (DHIS2-13702) (#2223)) }) it('legend key is hidden', () => { expectLegendKeyToBeHidden()