resolve merge conflicts

7 years ago · 4e6a694162
1 changed files with 4 additions and 0 deletions
--- a/app/routes/app/containers/AppContainer.js
+++ b/app/routes/app/containers/AppContainer.js
@ -49,11 +49,15 @@ const mapDispatchToProps = {
  createInvoice,
  fetchInvoice,

+<<<<<<< HEAD
 <<<<<<< HEAD
  fetchBlockHeight
 =======
  clearError
 >>>>>>> feature(globalerror): clear error
+=======
+  clearError
+>>>>>>> 46b03abc5a79d74487165abf8656e69da020f3bc
 }

 const mapStateToProps = state => ({