Merge pull request #1301 from data-driven-forms/fix-stash-marks

Hyperkid123 · web-flow · commit 495e57fb00e5 · 2022-08-04T15:23:33.000+02:00
fix(mui): remove git stash marks
diff --git a/packages/mui-component-mapper/src/date-picker/date-picker.d.ts b/packages/mui-component-mapper/src/date-picker/date-picker.d.ts
@@ -6,10 +6,7 @@ type InternalDatePickerProps<TInputDate, TDate> = MuiDatePickerProps<TInputDate,
 }
 
 export type DatePickerProps<TInputDate, TDate> = InternalDatePickerProps<TInputDate, TDate> & UseFieldApiComponentConfig;
-<<<<<<< Updated upstream
-=======
 
->>>>>>> Stashed changes
 declare const DatePicker: React.ComponentType<DatePickerProps<any, any>>;
 
 export default DatePicker;

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,7 @@ type InternalDatePickerProps<TInputDate, TDate> = MuiDatePickerProps<TInputDate,`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`export type DatePickerProps<TInputDate, TDate> = InternalDatePickerProps<TInputDate, TDate> & UseFieldApiComponentConfig;`
`9`		`-<<<<<<< Updated upstream`
`10`		`-=======`
`11`	`9`
`12`		`->>>>>>> Stashed changes`
`13`	`10`	`declare const DatePicker: React.ComponentType<DatePickerProps<any, any>>;`
`14`	`11`
`15`	`12`	`export default DatePicker;`