Riskeer

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
Last Commit: 26 Nov
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 09 Jun 2021
11:04 am

Ringo van der Velden <ringo.vandervelden@deltares.nl>

Removed is relevant related logic. WTI-2275

Options
    • -43
    • +6
    /Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsCalculationsProperties.cs
    • -116
    • +13
    /Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsCalculationsPropertiesTest.cs
10:57 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -18
    • +7
    /Core/Gui/test/Core.Gui.Test/Forms/Chart/ChartDataCollectionTreeNodeInfoTest.cs
    • -25
    • +5
    /Core/Gui/test/Core.Gui.Test/Forms/Chart/ChartDataContextTreeNodeInfoTest.cs
    • -3
    • +4
    /Core/Gui/test/Core.Gui.Test/Forms/Chart/ChartLegendViewTest.cs
    • -7
    • +2
    /Core/Gui/test/Core.Gui.Test/Forms/MainWindow/MainWindowTest.cs
    • -2
    • +2
    /Core/Gui/test/Core.Gui.Test/PresentationObjects/Chart/ChartDataContextTest.cs
    • -0
    • +1
    /Core/Gui/test/Core.Gui.Test/PropertyClasses/Chart/ChartDataCollectionPropertiesTest.cs
    • -1
    • +1
    /Core/Gui/test/Core.Gui.TestUtil/Map/TestMapView.cs
10:43 am

Ringo van der Velden <ringo.vandervelden@deltares.nl>

Rename. WTI-2275

Options
    • -0
    • +249
    /Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsCalculationsProperties.cs
    • -249
    • +0
    /Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs
    • -2
    • +2
    /Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
    • -0
    • +368
    /Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsCalculationsPropertiesTest.cs
    • -368
    • +0
    /Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs
    • -1
    • +1
    /Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs
    • -0
    • +81
    /Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsCalculationsPropertyInfoTest.cs
    • -81
    • +0
    /Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsFailureMechanismPropertyInfoTest.cs
10:27 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Plugin/Chart/ChartPropertyInfoFactory.cs
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Plugin/Map/MapImportInfoFactory.cs
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Plugin/Map/MapPropertyInfoFactory.cs
10:25 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -0
    • +3
    /Core/Gui/src/Core.Gui/Forms/Chart/ChartLegendView.cs
    • -15
    • +9
    /Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs
    • -2
    • +1
    /Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.cs
    • -1
    • +1
    /Core/Gui/test/Core.Gui.Test/Forms/MainWindow/MainWindowTest.cs
10:23 am

Elmar Kleijn

Small cleanups. WTI-2271

Options
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Properties/Resources.Designer.cs
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Properties/Resources.resx
10:23 am

Ringo van der Velden <ringo.vandervelden@deltares.nl>

Removed is relevant related logic. WTI-2274

Options
    • -1
    • +1
    /Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsCalculationsProperties.cs
10:20 am

Ringo van der Velden <ringo.vandervelden@deltares.nl>

Removed is relevant related logic. WTI-2274

Options
    • -45
    • +5
    /Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsCalculationsProperties.cs
    • -121
    • +16
    /Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs
9:03 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -6
    • +6
    /Core/Gui/src/Core.Gui/Attributes/DynamicPropertyOrderEvaluationMethodAttribute.cs
    • -6
    • +6
    /Core/Gui/src/Core.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs
    • -6
    • +6
    /Core/Gui/src/Core.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs
9:01 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -1
    • +23
    /Core/Gui/src/Core.Gui/Style/Symbols/Symbols.xaml
9:01 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -4
    • +1
    /Application/Riskeer/src/Application.Riskeer/App.xaml.cs
    • -39
    • +0
    /Core/Gui/src/Core.Gui/Appenders/RiskeerUserDataFolderConverter.cs
    • -73
    • +0
    /Core/Gui/test/Core.Gui.Test/Appenders/RiskeerUserDataFolderConverterTest.cs
8:54 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Commands/RoutedCommandHandler.cs
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Forms/Backstage/AboutViewModel.cs
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Forms/Chart/ChartLegendView.cs
    • -2
    • +2
    /Core/Gui/src/Core.Gui/Forms/ProjectExplorer/ProjectExplorer.cs
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Forms/ViewHost/IDocumentViewController.cs
    • -2
    • +2
    /Core/Gui/src/Core.Gui/Plugin/StateInfo.cs
    • -7
    • +7
    /Core/Gui/test/Core.Gui.Test/Forms/Backstage/AboutViewModelTest.cs
    • -4
    • +4
    /Core/Gui/test/Core.Gui.Test/Forms/Backstage/BackstageViewModelTest.cs
    • -3
    • +3
    /Core/Gui/test/Core.Gui.Test/Forms/Backstage/InfoViewModelTest.cs
    • -1
    • +1
    /Core/Gui/test/Core.Gui.Test/Forms/Map/FeatureBasedMapDataContextTreeNodeInfoTest.cs
    • -1
    • +1
    /Core/Gui/test/Core.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs
    • -1
    • +1
    /Core/Gui/test/Core.Gui.Test/Forms/ViewHost/CustomLayoutAnchorableTest.cs
    • -5
    • +5
    /Core/Gui/test/Core.Gui.Test/Plugin/Chart/ChartPropertyInfoFactoryTest.cs
8:43 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -1
    • +1
    /Core/Gui/test/Core.Gui.Test/Commands/ApplicationFeatureCommandHandlerTest.cs
    • -8
    • +2
    /Core/Gui/test/Core.Gui.Test/GuiCoreTest.cs
    • -23
    • +3
    /Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
8:29 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -31
    • +0
    /Core/Gui/src/Core.Gui/Forms/ProjectExplorer/IProjectExplorer.cs
    • -1
    • +2
    /Core/Gui/src/Core.Gui/Forms/ProjectExplorer/ProjectExplorer.cs
    • -2
    • +2
    /Core/Gui/test/Core.Gui.Test/Forms/ProjectExplorer/ProjectExplorerTest.cs
8:22 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -6
    • +0
    /Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs
    • -19
    • +0
    /Core/Gui/test/Core.Gui.Test/Forms/MainWindow/MainWindowTest.cs
    • -28
    • +0
    /Core/Gui/test/Core.Gui.Test/GuiCoreTest.cs
    • -3
    • +0
    /Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
8:18 am

Ringo van der Velden <ringo.vandervelden@deltares.nl>

Rename. WTI-2274

Options
    • -0
    • +258
    /Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsCalculationsProperties.cs
    • -258
    • +0
    /Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismProperties.cs
    • -2
    • +2
    /Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
    • -0
    • +386
    /Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs
    • -386
    • +0
    /Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs
    • -1
    • +1
    /Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs
    • -0
    • +81
    /Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsCalculationsPropertyInfoTest.cs
    • -81
    • +0
    /Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/PropertyInfos/GrassCoverErosionInwardsFailureMechanismPropertyInfoTest.cs
8:07 am

Robert Tangerman <robert.tangerman@deltares.nl>

Review related changes. WTI-2239

Options
    • -1
    • +1
    /Core/Gui/src/Core.Gui/Forms/MainWindow/IMainWindow.cs
    • -7
    • +4
    /Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs
    • -2
    • +3
    /Core/Gui/test/Core.Gui.Test/Forms/MainWindow/MainWindowTest.cs
Tuesday 08 Jun 2021
8:16 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -0
    • +5
    /Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs
    • -1
    • +5
    /Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
    • -2
    • +7
    /Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
8:14 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -1
    • +7
    /Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
8:13 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -0
    • +5
    /Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationsContextTreeNodeInfoTest.cs
    • -1
    • +4
    /Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
    • -1
    • +4
    /Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
8:12 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -1
    • +5
    /Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
    • -1
    • +5
    /Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs
    • -1
    • +5
    /Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs
8:10 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -3
    • +7
    /Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
    • -3
    • +7
    /Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs
    • -4
    • +9
    /Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs
    • -4
    • +9
    /Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs
8:07 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -3
    • +6
    /Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs
    • -4
    • +9
    /Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs
    • -2
    • +6
    /Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs
8:06 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -4
    • +21
    /Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs
    • -1
    • +6
    /Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs
    • -1
    • +6
    /Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
    • -4
    • +22
    /Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs
    • -1
    • +6
    /Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs
7:59 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -1
    • +5
    /Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
    • -1
    • +5
    /Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs
    • -1
    • +5
    /Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationsContextTreeNodeInfoTest.cs
7:56 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -3
    • +8
    /Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs
    • -4
    • +21
    /Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs
    • -2
    • +7
    /Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs
    • -1
    • +6
    /Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
    • -2
    • +6
    /Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
    • -1
    • +4
    /Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
    • -6
    • +27
    /Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs
    • -2
    • +7
    /Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs
7:44 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -1
    • +5
    /Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
    • -0
    • +3
    /Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
    • -0
    • +3
    /Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs
5:40 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -1
    • +5
    /Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionCalculationsContextTreeNodeInfoTest.cs
    • -3
    • +20
    /Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs
    • -1
    • +6
    /Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs
5:37 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed tests. WTI-2247

Options
    • -0
    • +3
    /Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
    • -0
    • +4
    /Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs
    • -0
    • +3
    /Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationsContextTreeNodeInfoTest.cs
4:43 pm

Elmar Kleijn

Merge branch 'master' of https://www.github.com/deltares/Riskeer

# Conflicts:

# Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs

Options
    • -3
    • +1
    /Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs