status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix merge conflict

This commit is contained in:
Iuri Matias 2018-10-24 14:11:24 -04:00
parent f0eb03bf05
commit 8e6272d75f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embark-ui/src/containers/TextEditorContainer.js
View File

@ -18,14 +18,14 @@ class TextEditorContainer extends React.Component {
render() { render() {
return ( return (
<TextEditor file={props.currentFile} <TextEditor file={this.props.currentFile}
currentFile={this.props.currentFile} currentFile={this.props.currentFile}
breakpoints={this.props.breakpoints} breakpoints={this.props.breakpoints}
toggleBreakpoint={this.props.toggleBreakpoint} toggleBreakpoint={this.props.toggleBreakpoint}
editorTabs={this.props.editorTabs} editorTabs={this.props.editorTabs}
removeEditorTabs={this.props.removeEditorTabs} removeEditorTabs={this.props.removeEditorTabs}
addEditorTabs={this.props.addEditorTabs} addEditorTabs={this.props.addEditorTabs}
debuggerLine={props.debuggerLine} debuggerLine={this.props.debuggerLine}
onFileContentChange={this.props.onFileContentChange} /> onFileContentChange={this.props.onFileContentChange} />
) )
} }

1
embark-ui/src/reducers/index.js
View File

@ -350,6 +350,7 @@ function debuggerInfo(state={}, action) {
if (action.type === DEBUGGER_INFO[SUCCESS]) { if (action.type === DEBUGGER_INFO[SUCCESS]) {
return action.data; return action.data;
} }
return state;
} }
function editorTabs(state = [], action) { function editorTabs(state = [], action) {