From f81046dcf9fe4cd65bb61b432029b99818e90943 Mon Sep 17 00:00:00 2001
From: Matt Hillsdon <matt.hillsdon@microbit.org>
Date: Wed, 29 May 2024 17:09:09 +0100
Subject: [PATCH] Fix missed conflict

---
 src/editor/codemirror/CodeMirror.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/editor/codemirror/CodeMirror.tsx b/src/editor/codemirror/CodeMirror.tsx
index 30d3a0656..f831b0bbf 100644
--- a/src/editor/codemirror/CodeMirror.tsx
+++ b/src/editor/codemirror/CodeMirror.tsx
@@ -232,14 +232,11 @@ const CodeMirror = ({
     parameterHelpOption,
     uri,
     apiReferenceMap,
-<<<<<<< HEAD
     portals,
     portalFactory,
     setPortals,
-=======
     device,
     disableV2OnlyFeaturesWarning,
->>>>>>> main
   ]);
   useEffect(() => {
     // Do this separately as we don't want to destroy the view whenever options needed for initialization change.