test: fix leftover comment during conflict resolution

dhis2 · Oct 13, 2023 · 9bf7eaa · 9bf7eaa
1 parent b6865a1
commit 9bf7eaa
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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()