From 5835064219974797b0e1186be85bae4afc357091 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Tue, 14 Jun 2022 16:30:42 +0100 Subject: [PATCH] chore: fix merge conflicts --- src/components/navigation/items/ButtonItem.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/navigation/items/ButtonItem.tsx b/src/components/navigation/items/ButtonItem.tsx index 98583a78..adcd1442 100644 --- a/src/components/navigation/items/ButtonItem.tsx +++ b/src/components/navigation/items/ButtonItem.tsx @@ -15,13 +15,11 @@ import { stopPropagation } from "../../../lib/stopPropagation"; import { useIntermediate } from "../../../context/intermediate/Intermediate"; -import { Children } from "../../../types/Preact"; import ChannelIcon from "../../common/ChannelIcon"; import Tooltip from "../../common/Tooltip"; import UserIcon from "../../common/user/UserIcon"; import { Username } from "../../common/user/UserShort"; import UserStatus from "../../common/user/UserStatus"; -import IconButton from "../../ui/IconButton"; type CommonProps = Omit< JSX.HTMLAttributes,