fixup merge conflict

SU-SWS · May 10, 2024 · 594e1b0 · 594e1b0
1 parent 89b7f0f
commit 594e1b0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/components/elements/link.tsx b/src/components/elements/link.tsx
@@ -4,11 +4,7 @@ import {EnvelopeIcon} from "@heroicons/react/24/outline";
 import ActionLink from "@components/elements/action-link";
 import Button from "@components/elements/button";
 import {LinkProps} from "next/dist/client/link";
-<<<<<<< HEAD
 import clsx from "clsx";
-=======
-import {twMerge} from "tailwind-merge";
->>>>>>> 1.x
 
 type Props = HtmlHTMLAttributes<HTMLAnchorElement | HTMLButtonElement> & LinkProps & {
   /**