TrizTech/ohif-viewer
18
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OHIF/Viewers

Browse Source 
# Conflicts:
#	extensions/ohif-cornerstone-extension/package.json
#	package.json
#	src/components/Header/Header.js
#	src/components/Labelling/LabellingFlow.js
#	src/components/OHIFLogo/OHIFLogo.js
#	src/connectedComponents/ConnectedPluginSwitch.js
#	src/connectedComponents/ToolbarRow.js
#	src/utils/getDefaultToolbarButtons.js
#	src/utils/getDefaultToolbarButtons.test.js
#	yarn.lock
This commit is contained in:
dannyrb committed 2019-05-30 00:46:00 -04:00
2 parents 30ac5d1144 a3405e7a9e
commit ffbd6ad6e4
64 files changed
+988 -961
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/components/Header/index.js
+2 -2
View File
@@ -1,3 +1,3 @@
import Header from './Header'
import Header from './Header';
export default Header
export default Header;