fix rebase issues

This commit is contained in:
Iuri Matias 2018-10-14 13:05:24 -04:00 committed by Pascal Precht
parent 588641222b
commit deeeb985ad
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D

View File

@ -14,12 +14,9 @@ import {
import DataWrapper from "../components/DataWrapper";
import Processes from '../components/Processes';
import Console from '../components/Console';
import {getProcesses, getProcessLogs} from "../reducers/selectors";
import {EMBARK_PROCESS_NAME} from '../constants';
import ContractsList from '../components/ContractsList';
import {getContracts, getProcesses, getCommands, getProcessLogs} from "../reducers/selectors";
const EMBARK_PROCESS_NAME = 'Embark';
import {getContracts, getProcesses, getProcessLogs} from "../reducers/selectors";
class HomeContainer extends Component {
constructor(props) {
@ -90,7 +87,6 @@ function mapStateToProps(state) {
return {
processes: getProcesses(state),
contracts: getContracts(state),
commands: getCommands(state),
error: state.errorMessage,
processLogs: getProcessLogs(state),
loading: state.loading