Fisheye: Diff - Riskeer/Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs

Tree
Options

4d6b107

Resolved by: - temporarily discarding their changes when concerning a binary file - .sql files were merged accordingly
Merge branch 'master' into 1579

# Conflicts:
# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
# build/DatabaseStructure.sql
# design/DatabaseDesign.eap

25 Jan 18 Dennis Tang <dennis.tang@deltares.nl> 4d6b107a57f8108b102fb711569d1d33a3023389

d151995

Removed semi probabilistic output for macro stability from storage. WTI-1581

23 Jan 18 Robert Tangerman <robert.tangerman@deltares.nl> d1519950f365a9a8d3f4f75186f73e98a6ac6b51

Loading ...