From 6c67851909aa4463541ea88d95b6c61c5890f421 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 16 Feb 2026 01:42:51 -0500
Subject: [PATCH] fix merge conflict

---
 packages/codemirror/codemirror.mjs | 1 -
 packages/codemirror/labelJump.mjs  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/codemirror/codemirror.mjs b/packages/codemirror/codemirror.mjs
index 493c13fde..d84e8b33e 100644
--- a/packages/codemirror/codemirror.mjs
+++ b/packages/codemirror/codemirror.mjs
@@ -20,7 +20,6 @@ import { evalBlock } from './block_utilities.mjs';
 import { flash, isFlashEnabled } from './flash.mjs';
 import { highlightMiniLocations, isPatternHighlightingEnabled, updateMiniLocations } from './highlight.mjs';
 import { keybindings } from './keybindings.mjs';
-import { jumpToCharacter } from './labelJump.mjs';
 import { getSliderWidgets, sliderPlugin, updateSliderWidgets } from './slider.mjs';
 import { activateTheme, initTheme, theme } from './themes.mjs';
 import { isTooltipEnabled } from './tooltip.mjs';
diff --git a/packages/codemirror/labelJump.mjs b/packages/codemirror/labelJump.mjs
index 12e5400db..54914a068 100644
--- a/packages/codemirror/labelJump.mjs
+++ b/packages/codemirror/labelJump.mjs
@@ -74,7 +74,7 @@ export function jumpToNextCharacter(view, character, direction = 1) {
  * @param {EditorView} view 
  * @param {String} character 
  * @param {number} index the instance of the character  
- * @returns 
+ * @returns {true}
  */
 export function jumpToCharacter(view, character, index) {
   const { state, dispatch } = view;
@@ -126,7 +126,7 @@ export function deleteAllInlineBeforeCharacter(view, character) {
  * @param {String} character 
  * @param {String} character2 
  * @param {number} index 
- * @returns 
+ * @returns {true}
  */
 export function InsertCharBeforeChar(view, character, character2, index) {
   const { state, dispatch } = view;