fix merge conflict

This commit is contained in:
Jade (Rose) Rowland
2026-02-16 01:42:51 -05:00
parent 109ea3093b
commit 6c67851909
2 changed files with 2 additions and 3 deletions
-1
View File
@@ -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';
+2 -2
View File
@@ -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;