From 23e77b5f035f37c8ffbd6fbee149beab13f600d7 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 2 Mar 2026 13:35:36 +0100
Subject: [PATCH] :bug: Fix merge issues

---
 .../app/main/data/workspace/tokens/application.cljs    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/main/data/workspace/tokens/application.cljs b/frontend/src/app/main/data/workspace/tokens/application.cljs
index 95b0a2cf2c..8bd421391a 100644
--- a/frontend/src/app/main/data/workspace/tokens/application.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/application.cljs
@@ -681,12 +681,12 @@
                              (if (rx/observable? res)
                                res
                                (rx/of res))))
-                         (rx/of (dwu/commit-undo-transaction undo-id))))))))))
+                         (rx/of (dwu/commit-undo-transaction undo-id)))))))))
 
-        (rx/of (ntf/show {:content (tr "workspace.tokens.error-text-edition")
-                          :type :toast
-                          :level :warning
-                          :timeout 3000}))))))
+          (rx/of (ntf/show {:content (tr "workspace.tokens.error-text-edition")
+                            :type :toast
+                            :level :warning
+                            :timeout 3000})))))))
 
 (defn apply-spacing-token-separated
   "Handles edge-case for spacing token when applying token via toggle button.