Fix missed conflict

microbit-foundation · May 29, 2024 · f81046d · f81046d
1 parent a492d04
commit f81046d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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.