diff --git a/package.json b/package.json index 2746855f..1a3819b1 100644 --- a/package.json +++ b/package.json @@ -20,11 +20,7 @@ "@types/react-router-dom": "^4.3.5", "@types/react-sortable-hoc": "^0.6.5", "@types/react-virtualized": "^9.21.4", -<<<<<<< HEAD - "@types/xlsx": "^0.0.36", -======= "algoliasearch": "^3.34.0", ->>>>>>> 388c726eacf3bd64f948944e2771b63a8afddedc "array-move": "^2.1.0", "attr-accept": "^1.1.3", "convert-csv-to-json": "^0.0.15", diff --git a/src/components/ExcelImport.tsx b/src/components/ImportCSV.tsx similarity index 94% rename from src/components/ExcelImport.tsx rename to src/components/ImportCSV.tsx index dcaf4081..36aa9aea 100644 --- a/src/components/ExcelImport.tsx +++ b/src/components/ImportCSV.tsx @@ -13,7 +13,7 @@ import { } from "@material-ui/core"; // TODO: Create an interface for props -export default function ImportExcel(props: any) { +export default function ImportCSV(props: any) { const { classes, columnName, updateColumn } = props; const [open, setOpen] = React.useState(false); const onDrop = useCallback(async acceptedFiles => { @@ -63,7 +63,7 @@ export default function ImportExcel(props: any) {
Drag 'n' drop .xlsx here, or click to select file
+Drag 'n' drop .csv here, or click to select file