HomePhabricator
Diffusion MITK 079a3dd37298

Fixed merge conflict

Description

Fixed merge conflict

Details

Provenance
seitelaAuthored on Apr 19 2018, 10:27 AM
seitelaPushed on Apr 19 2018, 10:28 AM
Parents
rMITKb629f30408af: Added the feature "Writing a ultrasound (video) device configuration to a xml…
Branches
Unknown
Tags
Unknown