合并冲突问题

2025-08-23 21:47:04 +08:00
parent ff928bb8b6
commit 8a4f3722a7
3 changed files with 2 additions and 8 deletions
--- a/src/components/Range/index.tsx
+++ b/src/components/Range/index.tsx
@@ -11,10 +11,7 @@ interface RangeProps {
  onChange?: (value: [number, number]) => void;
  disabled?: boolean;
  className?: string;
-<<<<<<< HEAD
  showTitle?: boolean;
-=======
->>>>>>> 2b7c9497c6d5b1f3edb2ddd937855570c0cc8eca
 }

 const NtrpRange: React.FC<RangeProps> = ({
@@ -25,10 +22,7 @@ const NtrpRange: React.FC<RangeProps> = ({
  onChange,
  disabled = false,
  className,
-<<<<<<< HEAD
  showTitle = true,
-=======
->>>>>>> 2b7c9497c6d5b1f3edb2ddd937855570c0cc8eca
 }) => {
  const [currentValue, setCurrentValue] = useState<[number, number]>(value);