Fix conflicts

This commit is contained in:
Marcel Mraz 2025-05-01 12:24:51 +02:00
parent 08baaa5c58
commit d671730971
No known key found for this signature in database
GPG key ID: 4EBD6E62DC830CD2

View file

@ -1,3 +1,5 @@
import { CaptureUpdateAction } from "@excalidraw/element/store";
import type { ExcalidrawElement } from "@excalidraw/element/types"; import type { ExcalidrawElement } from "@excalidraw/element/types";
import { import {
@ -5,7 +7,6 @@ import {
convertElementTypePopupAtom, convertElementTypePopupAtom,
} from "../components/ConvertElementTypePopup"; } from "../components/ConvertElementTypePopup";
import { editorJotaiStore } from "../editor-jotai"; import { editorJotaiStore } from "../editor-jotai";
import { CaptureUpdateAction } from "../store";
import { register } from "./register"; import { register } from "./register";