fix leftover diff

c3g · Nov 29, 2024 · 24ca02d · 24ca02d
1 parent ce9ce0f
commit 24ca02d
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/triton-server/src/notifications/utils.ts b/triton-server/src/notifications/utils.ts
@@ -1,21 +1,10 @@
-<<<<<<< Updated upstream
 import { TritonDataset } from "../types/api"
-=======
-import { TritonDataset } from "../../../triton-types/models/api"
->>>>>>> Stashed changes
 
 export const mockDataset: TritonDataset = {
     id: 987654,
     lane: 123546,
     external_project_id: "project-id-testing",
     project_name: "project name",
-<<<<<<< Updated upstream
-    run_name: "test name",
-    readset_count: 19,
-    released_status_count: 99,
-    blocked_status_count: 64,
-    latest_release_update: new Date(),
-=======
     run_name: "run name",
     readset_count: 19,
     released_status_count: 99,
@@ -26,7 +15,6 @@ export const mockDataset: TritonDataset = {
     validation_status: 1,
     released_by: "hello",
     validated_by: "potato",
->>>>>>> Stashed changes
 }
 
 export const formatDateAndTime = (date?: Date): string => {