Resolved extraneous merge conflicts

patternfly · Jun 4, 2024 · 4aff975 · 4aff975
1 parent a9fd181
commit 4aff975
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/...c/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx b/...c/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx
@@ -8,11 +8,7 @@ interface DualListSelectorState {
   chosenOptions: React.ReactNode[];
 }
 
-<<<<<<< HEAD:packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorBasicDemo.tsx
-export class DualListSelectorBasicDemo extends Component<DualListSelectorProps, DualListSelectorState> {
-=======
-class DualListSelectorDeprecatedBasicDemo extends React.Component<DLSPropsDeprecated, DualListSelectorState> {
->>>>>>> 1949bbd2d (feat(DualListSelector): promoted Next version):packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx
+class DualListSelectorDeprecatedBasicDemo extends Component<DLSPropsDeprecated, DualListSelectorState> {
   static displayName = 'DualListSelectorDemo';
   onListChange: (
     event: React.MouseEvent<HTMLElement>,

diff --git a/...rc/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx b/...rc/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx
@@ -9,11 +9,7 @@ interface DualListSelectorState {
   chosenOptions: DLSTreeItemDataDeprecated[];
 }
 
-<<<<<<< HEAD:packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorTreeDemo.tsx
-export class DualListSelectorTreeDemo extends Component<DualListSelectorProps, DualListSelectorState> {
-=======
-class DualListSelectorDeprecatedTreeDemo extends React.Component<DLSPropsDeprecated, DualListSelectorState> {
->>>>>>> 1949bbd2d (feat(DualListSelector): promoted Next version):packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx
+class DualListSelectorDeprecatedTreeDemo extends Component<DLSPropsDeprecated, DualListSelectorState> {
   static displayName = 'DualListSelectorTreeDemo';
   onListChange: (
     event: React.MouseEvent<HTMLElement>,