Diffusion MITK 53d7c820eff6

Fixed merge error
53d7c820eff6
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Fixed merge error

Details

Provenance

seitela	Authored on Apr 27 2017, 5:47 PM
seitela	Pushed on Apr 27 2017, 5:47 PM

Differential Revision

Restricted Differential Revision

Parents

rMITKf70938720248: Merge branch 'T22595-NavigationModules-2016-11' of https://phabricator.mitk.

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITK53d7c820eff6: Fixed merge error (authored by seitela).Apr 27 2017, 5:47 PM

Changes (2)

Path

Size

Plugins/

org.mitk.gui.qt.igt.app.echotrack/

src/

internal/

USNavigationMarkerPlacement.cpp

USNavigationMarkerPlacement.h

rMITK53d7c820eff6

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.h

Loading...