From d6717309718226da8d7e7aa63f49088a58c6e043 Mon Sep 17 00:00:00 2001
From: Marcel Mraz <marcel@excalidraw.com>
Date: Thu, 1 May 2025 12:24:51 +0200
Subject: [PATCH] Fix conflicts

---
 packages/excalidraw/actions/actionToggleShapeSwitch.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/excalidraw/actions/actionToggleShapeSwitch.tsx b/packages/excalidraw/actions/actionToggleShapeSwitch.tsx
index 39e7566fb7..aea8f986ec 100644
--- a/packages/excalidraw/actions/actionToggleShapeSwitch.tsx
+++ b/packages/excalidraw/actions/actionToggleShapeSwitch.tsx
@@ -1,3 +1,5 @@
+import { CaptureUpdateAction } from "@excalidraw/element/store";
+
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 import {
@@ -5,7 +7,6 @@ import {
   convertElementTypePopupAtom,
 } from "../components/ConvertElementTypePopup";
 import { editorJotaiStore } from "../editor-jotai";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";