fix error

src/components/hook-form/rhf-numeric.tsx

@@ -28,11 +28,8 @@ export function RHFNumeric({
   maxValue,
   minValue,
   readOnly,
-<<<<<<< HEAD
   displayOnly = false,
-=======
   negativeMask = 'prefix',
->>>>>>> c01b578371dc0ae1737eb9b12fc456e83b835b3f
   ...props
 }: RHFNumericProps) {
   const { control } = useFormContext();
@@ -112,13 +109,9 @@ export function RHFNumeric({
               fixedDecimalScale: false,
               maxValue,
               minValue,
-<<<<<<< HEAD
-
+              negativeMask,
               // format-component butuhkan ini agar tidak error
               valueIsNumericString: true,
-=======
-              negativeMask,
->>>>>>> c01b578371dc0ae1737eb9b12fc456e83b835b3f
             },
 
             style: displayOnly