Fix faulty conflict resolutions

- for finos:main -> sl:main
ScottLogic · Nov 13, 2023 · 46cf3e5 · 46cf3e5
1 parent 66fc0db
commit 46cf3e5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/vuu-ui/packages/vuu-layout/test/layout-persistence/LocalLayoutPersistenceManager.test.ts b/vuu-ui/packages/vuu-layout/test/layout-persistence/LocalLayoutPersistenceManager.test.ts
@@ -263,19 +263,13 @@ describe("updateLayout", () => {
   it("errors if there are no metadata entries and multiple layouts in local storage with requested ID ", async () => {
     saveLocalEntity(layoutsSaveLocation, [existingLayout, existingLayout]);
 
-<<<<<<< HEAD
     expectPromiseRejectsWithError(
       () =>
         persistenceManager.updateLayout(
           existingId,
           metadataToUpdate,
           layoutToAdd
         ),
-=======
-    expectError(
-      () =>
-        persistenceManager.updateLayout(existingId, metadataToAdd, layoutToAdd),
->>>>>>> finos-main
       `No metadata with ID ${existingId}; Non-unique layout with ID ${existingId}`
     );
   });

diff --git a/vuu-ui/showcase/src/examples/Table/TableNext.examples.tsx b/vuu-ui/showcase/src/examples/Table/TableNext.examples.tsx
@@ -6,15 +6,14 @@ import {
   View,
 } from "@finos/vuu-layout";
 import { ContextPanel } from "@finos/vuu-shell";
-import { TableNext } from "@finos/vuu-table";
+import { GroupHeaderCellNext, TableNext } from "@finos/vuu-table";
 import {
   ColumnSettingsPanel,
   TableSettingsPanel,
 } from "@finos/vuu-table-extras";
 import { ColumnDescriptor, TableConfig } from "@finos/vuu-datagrid-types";
 import { CSSProperties, useCallback, useMemo, useState } from "react";
 import { useTableConfig, useTestDataSource } from "../utils";
-import { GroupHeaderCellNext } from "@finos/vuu-table";
 import { getAllSchemas } from "@finos/vuu-data-test";
 
 import "./TableNext.examples.css";