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
Loading
Please sign in to comment