Revert "Merge remote-tracking branch 'origin/git-hooks-libms' into gi…

…t-hooks-libms"

This reverts commit c27b33c, reversing
changes made to 3186f10.

client/test/unitTests/Components/TabComponent.test.tsx

@@ -11,7 +11,7 @@ describe('TabComponent', () => {
 
   test('renders an empty tab', () => {
     const { getByText } = render(
-      <TabComponent assetType={assetTypeTabs} scope={scopeTabs} />,
+      <TabComponent assetType={assetTypeTabs} scope={scopeTabs} />
     );
     const emptyTab = getByText('Functions');
     expect(emptyTab).toBeInTheDocument();
@@ -60,17 +60,10 @@ describe('TabComponent', () => {
     }
 
     expect(
-<<<<<<< HEAD
       screen.queryByText(assetTypeTabs[0].body.props.children)
     ).not.toBeInTheDocument();
     expect(
       screen.queryByText(assetTypeTabs[1].body.props.children)
-=======
-      screen.queryByText(assetTypeTabs[0].body.props.children),
-    ).not.toBeInTheDocument();
-    expect(
-      screen.queryByText(assetTypeTabs[1].body.props.children),
->>>>>>> origin/git-hooks-libms
     ).not.toBeInTheDocument();
   });