From 989eb1213973fe0941bfa4516ba10f1eaa07c6b6 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 6 Feb 2026 11:38:36 +0100
Subject: [PATCH] :fire: Remove merge conflict from plugins api ns

---
 frontend/src/app/plugins/api.cljs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/plugins/api.cljs b/frontend/src/app/plugins/api.cljs
index 81b72817b2..00a59b0011 100644
--- a/frontend/src/app/plugins/api.cljs
+++ b/frontend/src/app/plugins/api.cljs
@@ -364,13 +364,10 @@
                   (cb/with-objects (:objects page))
                   (cb/add-object shape))]
 
-          (st/emit!
-           (ch/commit-changes changes)
-<<<<<<< HEAD
-           (se/event plugin-id "create-shape" :type :text))
-=======
-           (dwwt/resize-wasm-text-debounce (:id shape)))
->>>>>>> origin/staging-render
+          (st/emit! (ch/commit-changes changes)
+                    (se/event plugin-id "create-shape" :type :text)
+                    (dwwt/resize-wasm-text-debounce (:id shape)))
+
           (shape/shape-proxy plugin-id (:id shape)))))
 
     :createShapeFromSvg