Bruno Alves de Faria 55901e2b38 Fixing merge issues

2017-01-31 18:07:52 -02:00

..

both

Removing ohif-cornerstone as a dependency for ohif-viewerbase. It should be added in the Viewer level. Avoiding error on temp measurements

2017-01-29 22:11:19 -02:00

client

Fixing merge issues

2017-01-31 18:07:52 -02:00

package.js

Change 'design' to 'ohif:design' in package.js for each package

2017-01-29 22:11:17 -02:00