Fix broken merge result

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

packages/mui-base/src/utils/index.ts

@@ -1,12 +1,7 @@
-export { appendOwnerState } from './appendOwnerState';
-export { areArraysEqual } from './areArraysEqual';
-export { ClassNameConfigurator } from './ClassNameConfigurator';
-export { extractEventHandlers } from './extractEventHandlers';
-export { isHostComponent } from './isHostComponent';
-export { resolveComponentProps } from './resolveComponentProps';
-export { useRootElementName } from './useRootElementName';
-export { useSlotProps } from './useSlotProps';
-export { mergeSlotProps } from './mergeSlotProps';
-export { prepareForSlot } from './prepareForSlot';
-export * from './PolymorphicComponent';
-export * from './types';
+// Public utils
+
+export * from './prepareForSlot';
+export * from './MuiCancellableEvent';
+export * from './useScrollLock';
+export * from './useTransitionStatus';
+export * from './visuallyHidden';