From 8e6272d75f3615113a22c412f6a2498468fd5a2e Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Wed, 24 Oct 2018 14:11:24 -0400
Subject: [PATCH] fix merge conflict

---
 embark-ui/src/containers/TextEditorContainer.js | 4 ++--
 embark-ui/src/reducers/index.js                 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/embark-ui/src/containers/TextEditorContainer.js b/embark-ui/src/containers/TextEditorContainer.js
index f7845db94..00a3e04ca 100644
--- a/embark-ui/src/containers/TextEditorContainer.js
+++ b/embark-ui/src/containers/TextEditorContainer.js
@@ -18,14 +18,14 @@ class TextEditorContainer extends React.Component {
 
   render() {
     return (
-      <TextEditor file={props.currentFile}
+      <TextEditor file={this.props.currentFile}
                   currentFile={this.props.currentFile}
                   breakpoints={this.props.breakpoints}
                   toggleBreakpoint={this.props.toggleBreakpoint}
                   editorTabs={this.props.editorTabs}
                   removeEditorTabs={this.props.removeEditorTabs}
                   addEditorTabs={this.props.addEditorTabs}
-                  debuggerLine={props.debuggerLine}
+                  debuggerLine={this.props.debuggerLine}
                   onFileContentChange={this.props.onFileContentChange} />
     )
   }
diff --git a/embark-ui/src/reducers/index.js b/embark-ui/src/reducers/index.js
index 5d4177940..a2f1da97d 100644
--- a/embark-ui/src/reducers/index.js
+++ b/embark-ui/src/reducers/index.js
@@ -350,6 +350,7 @@ function debuggerInfo(state={}, action) {
   if (action.type === DEBUGGER_INFO[SUCCESS]) {
     return action.data;
   }
+  return state;
 }
 
 function editorTabs(state = [], action) {