Fixed merge conflicts

This commit is contained in:
Alejandro Celaya
2021-09-12 10:33:10 +02:00
5 changed files with 106 additions and 31 deletions

View File

@@ -7,7 +7,7 @@ type Ref<T> = RefObject<T> | MutableRefObject<T>;
export interface ImportServersBtnProps {
onImport?: () => void;
onImportError?: () => void;
onImportError?: (error: Error) => void;
}
interface ImportServersBtnConnectProps extends ImportServersBtnProps {