fix merge conflicts errors in UI

fleetdm · Jan 20, 2025 · 72cf7d3 · 72cf7d3
1 parent 55895e6
commit 72cf7d3
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/frontend/pages/hosts/details/cards/Activity/PastActivityFeed/PastActivityFeed.tsx b/frontend/pages/hosts/details/cards/Activity/PastActivityFeed/PastActivityFeed.tsx
@@ -1,14 +1,13 @@
 import React from "react";
 
-import { ActivityType, IHostPastActivity } from "interfaces/activity";
+import { IHostPastActivity } from "interfaces/activity";
 import { IHostPastActivitiesResponse } from "services/entities/activities";
 
 // @ts-ignore
 import FleetIcon from "components/icons/FleetIcon";
 import Button from "components/buttons/Button";
 import DataError from "components/DataError";
 import { ShowActivityDetailsHandler } from "components/ActivityItem/ActivityItem";
-import { ShowActivityDetailsHandler } from "components/ActivityItem/ActivityItem";
 
 import EmptyFeed from "../EmptyFeed/EmptyFeed";
 
@@ -20,7 +19,6 @@ interface IPastActivityFeedProps {
   activities?: IHostPastActivitiesResponse;
   isError?: boolean;
   onShowDetails: ShowActivityDetailsHandler;
-  onShowDetails: ShowActivityDetailsHandler;
   onNextPage: () => void;
   onPreviousPage: () => void;
 }
@@ -29,7 +27,6 @@ const PastActivityFeed = ({
   activities,
   isError = false,
   onShowDetails,
-  onShowDetails,
   onNextPage,
   onPreviousPage,
 }: IPastActivityFeedProps) => {
@@ -65,8 +62,6 @@ const PastActivityFeed = ({
               activity={activity}
               hideCancel
               onShowDetails={onShowDetails}
-              hideCancel
-              onShowDetails={onShowDetails}
             />
           );
         })}