From 4aff975871d3d742322d2b52f783e0a8d22cf474 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Tue, 4 Jun 2024 09:29:51 -0400
Subject: [PATCH] Resolved extraneous merge conflicts

---
 .../DualListSelectorDeprecatedBasicDemo.tsx                 | 6 +-----
 .../DualListSelectorDeprecatedTreeDemo.tsx                  | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx
index 04c87a6a079..75d52e31a8b 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/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/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx
index bb56d3a5163..8e4b4dac0cc 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/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>,