remove accidental close conflict marker

Opentrons · May 1, 2024 · 18b9f3d · 18b9f3d
1 parent 1a2dc21
commit 18b9f3d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/app/src/organisms/RunPreview/index.tsx b/app/src/organisms/RunPreview/index.tsx
@@ -24,7 +24,6 @@ import {
   useNotifyLastRunCommand,
   useNotifyAllCommandsAsPreSerializedList,
  } from '../../resources/runs'
->>>>>>> edge
 import { CommandText } from '../CommandText'
 import { Divider } from '../../atoms/structure'
 import { NAV_BAR_WIDTH } from '../../App/constants'