summaryrefslogtreecommitdiff
path: root/apps/web/src
diff options
context:
space:
mode:
authorenkeii64 <imenkei64@gmail.com>2025-07-17 00:07:39 +1000
committerenkeii64 <imenkei64@gmail.com>2025-07-17 00:07:39 +1000
commit7cbbbe1630db0e4edeeb11a8af42b4012b766379 (patch)
tree2640a1914cba8d7d6da4bd507d33b2ec65ffeece /apps/web/src
parente0a5d4860a8b5c6f4be70414a83613b6509b8a78 (diff)
downloadopencut-7cbbbe1630db0e4edeeb11a8af42b4012b766379.tar.gz
fix: resolve merge conflict in draggable-item.tsx
Diffstat (limited to 'apps/web/src')
-rw-r--r--apps/web/src/components/ui/draggable-item.tsx4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/web/src/components/ui/draggable-item.tsx b/apps/web/src/components/ui/draggable-item.tsx
index 6e1e4990..2af7932a 100644
--- a/apps/web/src/components/ui/draggable-item.tsx
+++ b/apps/web/src/components/ui/draggable-item.tsx
@@ -158,7 +158,7 @@ function PlusButton({
onClick?: () => void;
tooltipText?: string;
}) {
- return (
+ const button = (
<Button
size="icon"
className={cn("absolute bottom-2 right-2 size-4", className)}
@@ -172,4 +172,6 @@ function PlusButton({
<Plus className="!size-3" />
</Button>
);
+
+ return button;
}