External/OpenCut
1
0
Fork 0
mirror of https://github.com/OpenCut-app/OpenCut.git synced 2026-07-13 21:52:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve merge conflict in draggable-item.tsx

Browse Source
This commit is contained in:
enkeii64
2025-07-17 00:07:39 +10:00
parent e0a5d4860a
commit 7cbbbe1630
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/src/components/ui/draggable-item.tsx
+3 -1
View File
@@ -158,7 +158,7 @@ function PlusButton({
onClick?: () => void; onClick?: () => void;
tooltipText?: string; tooltipText?: string;
}) { }) {
return ( const button = (
<Button <Button
size="icon" size="icon"
className={cn("absolute bottom-2 right-2 size-4", className)} className={cn("absolute bottom-2 right-2 size-4", className)}
@@ -172,4 +172,6 @@ function PlusButton({
<Plus className="!size-3" /> <Plus className="!size-3" />
</Button> </Button>
); );
return button;
} }