Skip to content

Commit

Permalink
Merge conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
modamaan committed Jan 28, 2025
1 parent 8fafc2e commit 88413a5
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/components/Facility/FacilityHome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
</div>
</div>
<div className="flex-shrink-0">
{/* dropdown merge fail testing */}
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
Expand Down

0 comments on commit 88413a5

Please sign in to comment.