Skip to content
Commit 97ffe6a0 authored by Joachim Ehbrecht's avatar Joachim Ehbrecht
Browse files

Merge branch 'main' into 'update_intellisense_editor'

# Conflicts:
#   Common/Common.UI/Controls/Editors/IntelliSenseEditor/IntelliSenseEditor.cs
#   Common/Common.UI/Models/Editors/IntelliSenseEditor/ViewAdapter/IntelliSenseRowTextSegmentSyntaxContentViewAdapter.cs
#   Common/Common.UI/Models/Editors/RowBasedTextEditor/ViewAdapter/RowValidationViewAdapter.cs
#   Common/Common.UI/Models/Editors/RowBasedTextEditor/ViewAdapter/RowViewAdapter.cs
#   Common/Common.UI/Resources/EditorStyles.xaml
#   Common/Common.UI/ViewModels/Editors/IntelliSenseEditor/IntelliSenseEditorViewModelBase.cs
parents b229def1 43a191f8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment