Clone
Carlos Lubbers <carlos.lubbers@deltares.nl>
committed
on 23 Jul 18
Merge branch 'master' into 1722
# Conflicts:
# Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
# R… Show more
Merge branch 'master' into 1722

# Conflicts:

#       Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensionsTest.cs

#       Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs

Show less

1691 + 70 more