github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-04-25 11:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔥 Remove merge conflict from plugins api ns

Browse Source
This commit is contained in:
Andrey Antukh 2026-02-06 11:38:36 +01:00
parent a5e36dbb3d
commit 989eb12139
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/app/plugins/api.cljs
View File

@ -364,13 +364,10 @@
(cb/with-objects (:objects page)) (cb/with-objects (:objects page))
(cb/add-object shape))] (cb/add-object shape))]
(st/emit! (st/emit! (ch/commit-changes changes)
(ch/commit-changes changes) (se/event plugin-id "create-shape" :type :text)
<<<<<<< HEAD (dwwt/resize-wasm-text-debounce (:id shape)))
(se/event plugin-id "create-shape" :type :text))
=======
(dwwt/resize-wasm-text-debounce (:id shape)))
>>>>>>> origin/staging-render
(shape/shape-proxy plugin-id (:id shape))))) (shape/shape-proxy plugin-id (:id shape)))))
:createShapeFromSvg :createShapeFromSvg