The open-source CapCut alternative
fix: resolve merge conflict in draggable-item.tsx
enkeii647cbbbe1630db
diff --git a/apps/web/src/components/ui/draggable-item.tsx b/apps/web/src/components/ui/draggable-item.tsxindex 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 = (<Buttonsize="icon"className={cn("absolute bottom-2 right-2 size-4", className)}@@ -172,4 +172,6 @@ function PlusButton({<Plus className="!size-3" /></Button>);++ return button;}