chore: rebase

determined-ai · Oct 31, 2024 · 80ce947 · 80ce947
1 parent 2d96fe1
commit 80ce947
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/webui/react/src/utils/flatRun.ts b/webui/react/src/utils/flatRun.ts
@@ -122,14 +122,9 @@ export const removeColumnTypePrefix = (columnName: V1ColumnType): string => {
   return columnName.replace('COLUMN_TYPE_', '');
 };
 
-<<<<<<< HEAD
-/// wanna know why this separator is used? see https://hpe-aiatscale.atlassian.net/browse/ET-785
-export const METADATA_SEPARATOR = '\u241F' as const; // TODO: unify after merging PR 10052
-=======
 /// we want to use special characters as "separators" to prevent user input to match with such when creating the arbitrary metadata
 export const COLUMN_SEPARATOR = '␟';
 export const METADATA_SEPARATOR = '\u241F' as const;
->>>>>>> 29d837ce6 (feat: add metadata column type badge)
 
 export const formatColumnKey = (col: ProjectColumn, required = false): string => {
   if (required || col.location === V1LocationType.RUNMETADATA)