mirror of https://github.com/embarklabs/embark.git
fix merge issues
This commit is contained in:
parent
17c8a4927e
commit
bb844caa48
|
@ -16,9 +16,7 @@ const rootReducer = combineReducers({
|
|||
contractProfile: contractProfileReducer,
|
||||
blocks: blocksReducer,
|
||||
transactions: transactionsReducer,
|
||||
commands: commandsReducer,
|
||||
contracts: contractsReducer,
|
||||
contract: contractReducer
|
||||
commands: commandsReducer
|
||||
});
|
||||
|
||||
export default rootReducer;
|
||||
|
|
|
@ -16,7 +16,6 @@ const routes = (
|
|||
<Route path="/embark/explorer/" component={ExplorerLayout} />
|
||||
<Route path="/embark/processes/" component={ProcessesLayout} />
|
||||
<Route path="/embark/explorer/accounts" component={AccountsContainer} />
|
||||
<Route path="/embark/processes" component={ProcessesContainer} />
|
||||
<Route path="/embark/contracts/:contractName" component={ContractLayout} />
|
||||
<Route path="/embark/contracts" component={ContractsContainer} />
|
||||
<Route component={NoMatch} />
|
||||
|
|
|
@ -154,9 +154,9 @@ export default function *root() {
|
|||
fork(watchFetchProcessLogs),
|
||||
fork(watchListenToProcessLogs),
|
||||
fork(watchFetchBlock),
|
||||
fork(watchFetchTransactions)
|
||||
fork(watchFetchTransactions),
|
||||
fork(watchFetchTransaction),
|
||||
fork(watchPostCommand)
|
||||
fork(watchPostCommand),
|
||||
fork(watchFetchBlocks),
|
||||
fork(watchFetchContracts),
|
||||
fork(watchFetchContract),
|
||||
|
|
Loading…
Reference in New Issue