rebase

FNNDSC · Jun 13, 2024 · 85aab54 · 85aab54
1 parent e7fbabd
commit 85aab54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/Pacs/components/SeriesCard.tsx b/src/components/Pacs/components/SeriesCard.tsx
@@ -195,7 +195,11 @@ const SeriesCardCopy = ({ series }: { series: any }) => {
         });
       }
 
+<<<<<<< HEAD
       if (pushCount > 0 && pushCount === totalFilesCount && isFetching) {
+=======
+      if (pushCount > 0 && isFetching) {
+>>>>>>> a20afa3a (refactor: cleanup)
         // This means oxidicom is done pushing as the push count file is available
         // cancel polling
         setIsFetching(false);

diff --git a/src/components/PluginCatalog/PluginCatalog.tsx b/src/components/PluginCatalog/PluginCatalog.tsx
@@ -98,8 +98,6 @@ const PluginCatalog = () => {
     });
   };
 
-  console.log("Page State", pageState);
-
   return (
     <>
       <DisplayPage