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

Fixes conflict after pull

Browse Source
This commit is contained in:
João Felipe Medeiros Moreira 2019-06-06 15:12:30 -03:00
commit 56b595980e
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ohif-i18n/src/locales/en/US/Header.json
View File

@ -1,4 +1,4 @@
{ {
"options": "Erik Options", "options": "Options",
"about": "About" "about": "About"
} }

2
package.json
View File

@ -95,7 +95,7 @@
"react-resize-detector": "^3.4.0", "react-resize-detector": "^3.4.0",
"react-router": "^4.3.1", "react-router": "^4.3.1",
"react-router-dom": "^4.3.1", "react-router-dom": "^4.3.1",
"react-viewerbase": "file:.yalc/react-viewerbase", "react-viewerbase": "0.4.2",
"react-vtkjs-viewport": "^0.0.7", "react-vtkjs-viewport": "^0.0.7",
"redux": "^4.0.1", "redux": "^4.0.1",
"redux-oidc": "3.1.x" "redux-oidc": "3.1.x"

1
src/components/Header/Header.js
View File

@ -14,6 +14,7 @@ class Header extends Component {
location: PropTypes.object.isRequired, location: PropTypes.object.isRequired,
openUserPreferencesModal: PropTypes.func, openUserPreferencesModal: PropTypes.func,
children: PropTypes.node, children: PropTypes.node,
t: PropTypes.func.isRequired,
}; };
static defaultProps = { static defaultProps = {