olga-jane/prizm — pull request #142 by demmy (2014-11-05 16:05:22+00:00)
Title: Return edited entity for conflict resolve

This reverts commit 37e5c845d85ae0a2c0cf699c3ba53f94c18a2212.

Conflicts:
src/Domain/Entity/Mill/PipeTest.cs
src/Domain/Entity/Mill/PipeTestResult.cs
src/Domain/Entity/Mill/TensileTests.cs