Fix broken merge result

mui · Sep 4, 2024 · e59251e · e59251e
1 parent fe8662f
commit e59251e
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/packages/mui-base/src/Slider/index.ts b/packages/mui-base/src/Slider/index.ts
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-export { Slider } from './Slider';
-export * from './Slider.types';
-export * from './sliderClasses';
-=======
 export { SliderRoot as Root } from './Root/SliderRoot';
 export type {
   SliderRootOwnerState as SliderOwnerState,
@@ -52,4 +47,3 @@ export type {
   UseSliderIndicatorReturnValue,
 } from './Indicator/SliderIndicator.types';
 export { useSliderIndicator } from './Indicator/useSliderIndicator';
->>>>>>> upstream/master