Fix linting and TS errors from merge conflict resolution

smb2268 · smb2268 · commit 39b5d8590349 · 2025-06-05T15:05:23.000-04:00
diff --git a/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/getLPCLabwareInfoFrom/__tests__/getDefaultOffsetForLabware.test.ts b/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/getLPCLabwareInfoFrom/__tests__/getDefaultOffsetForLabware.test.ts
@@ -2,8 +2,8 @@ import { describe, expect, it, vi } from 'vitest'
 
 import { ANY_LOCATION } from '@opentrons/api-client'
 import {
-  C3_ADDRESSABLE_AREA,
   C2_ADDRESSABLE_AREA,
+  C3_ADDRESSABLE_AREA,
   getLabwareDefURI,
 } from '@opentrons/shared-data'
 
diff --git a/shared-data/protocol/types/schemaV8/index.ts b/shared-data/protocol/types/schemaV8/index.ts
@@ -147,7 +147,7 @@ export type ProtocolFile<
 > = ProtocolBase<DesignerApplicationData> &
   (OT2RobotMixin | OT3RobotMixin) &
   LabwareV2Mixin &
-  LiquidV1Mixin &
+  (LiquidV1Mixin | LiquidV2Mixin) &
   (
     | CommandV8Mixin
     | CommandV9Mixin

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ export type ProtocolFile<`
`147`	`147`	`> = ProtocolBase<DesignerApplicationData> &`
`148`	`148`	`(OT2RobotMixin \| OT3RobotMixin) &`
`149`	`149`	`LabwareV2Mixin &`
`150`		`- LiquidV1Mixin &`
	`150`	`+ (LiquidV1Mixin \| LiquidV2Mixin) &`
`151`	`151`	`(`
`152`	`152`	`\| CommandV8Mixin`
`153`	`153`	`\| CommandV9Mixin`