File tree Expand file tree Collapse file tree
packages/react-table/src/demos Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -64,13 +64,8 @@ import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
6464import RhUiQuestionMarkCircleFillIcon from '@patternfly/react-icons /dist/esm/icons/rh-ui-question-mark-circle-fill-icon';
6565import RhMicronsCaretDownIcon from '@patternfly/react-icons /dist/esm/icons/rh-microns-caret-down-icon';
6666import 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';
6967import RhUiBlueprintIcon from '@patternfly/react-icons /dist/esm/icons/rh-ui-blueprint-icon';
70- =======
7168import 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)
7469import EllipsisVIcon from '@patternfly/react-icons /dist/esm/icons/ellipsis-v-icon';
7570import { DashboardWrapper } from '@patternfly/react-table /dist/esm/demos/DashboardWrapper';
7671import { rows, columns } from '@patternfly/react-table /dist/esm/demos/sampleData';
You can’t perform that action at this time.
0 commit comments