Riskeer

Clone
Dennis Tang <dennis.tang@deltares.nl>
committed
b59831b
on 26 Jan 18
Resolved by: - Discarding their changes on binary files - Merging .sql files
Merge branch 'master' into 1579

# Conflicts:
# Application/Rin… Show more
Resolved by: - Discarding their changes on binary files - Merging .sql files

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.diagram

#       Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

#       build/DatabaseStructure.sql

#       design/DatabaseDesign.eap

Show less

1691 + 70 more