From 8f0860c312ec1323b945af6f975951238b52d95d Mon Sep 17 00:00:00 2001 From: EthanHealy01 Date: Fri, 5 Sep 2025 13:05:26 +0100 Subject: [PATCH] fix error caused by git auto merge --- .../pageEditor/{BulkSelectionPanel.ts => BulkSelection.ts} | 0 frontend/src/components/pageEditor/BulkSelectionPanel.tsx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename frontend/src/components/pageEditor/{BulkSelectionPanel.ts => BulkSelection.ts} (100%) diff --git a/frontend/src/components/pageEditor/BulkSelectionPanel.ts b/frontend/src/components/pageEditor/BulkSelection.ts similarity index 100% rename from frontend/src/components/pageEditor/BulkSelectionPanel.ts rename to frontend/src/components/pageEditor/BulkSelection.ts diff --git a/frontend/src/components/pageEditor/BulkSelectionPanel.tsx b/frontend/src/components/pageEditor/BulkSelectionPanel.tsx index 7ffd6b05c..8d09a6f35 100644 --- a/frontend/src/components/pageEditor/BulkSelectionPanel.tsx +++ b/frontend/src/components/pageEditor/BulkSelectionPanel.tsx @@ -11,7 +11,7 @@ import { lastNExpression, everyNthExpression, rangeExpression, -} from './BulkSelectionPanel'; +} from './BulkSelection'; interface BulkSelectionPanelProps { csvInput: string;