Skip to content

Commit ac6b113

Browse files
committed
fix rebase issue
1 parent 344396b commit ac6b113

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

packages/react-table/src/demos/Table.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,8 @@ import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
6464
import RhUiQuestionMarkCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-question-mark-circle-fill-icon';
6565
import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon';
6666
import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon';
67-
<<<<<<< HEAD
68-
import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
6967
import RhUiBlueprintIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-blueprint-icon';
70-
=======
7168
import RhUiMenuBarsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-menu-bars-icon';
72-
import BlueprintIcon from '@patternfly/react-icons/dist/esm/icons/blueprint-icon';
73-
>>>>>>> 0252229b3f (chore(BarsIcon): Updat all uses of Bars icons to use RhUiMenuBarsIcon instead)
7469
import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
7570
import { DashboardWrapper } from '@patternfly/react-table/dist/esm/demos/DashboardWrapper';
7671
import { rows, columns } from '@patternfly/react-table/dist/esm/demos/sampleData';

0 commit comments

Comments
 (0)