From 18b9f3dbeeac5c45ed1e0eee885c020549d6ceb3 Mon Sep 17 00:00:00 2001
From: Brian Cooper <brian@opentrons.com>
Date: Wed, 1 May 2024 17:43:00 -0400
Subject: [PATCH] remove accidental close conflict marker

---
 app/src/organisms/RunPreview/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/organisms/RunPreview/index.tsx b/app/src/organisms/RunPreview/index.tsx
index 05178f0c05f..2c36042a6ca 100644
--- 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'