mirror of https://github.com/embarklabs/embark.git
conflict in action
This commit is contained in:
parent
ea3cd474b9
commit
d27ecb5b20
|
@ -74,22 +74,8 @@ export const processLogs = {
|
|||
request: (processName) => action(PROCESS_LOGS[REQUEST], {processName}),
|
||||
success: (processLogs) => action(PROCESS_LOGS[SUCCESS], {processLogs}),
|
||||
failure: (error) => action(PROCESS_LOGS[FAILURE], {error})
|
||||
export function initBlockHeader(){
|
||||
return {
|
||||
type: INIT_BLOCK_HEADER
|
||||
};
|
||||
}
|
||||
|
||||
export function fetchContractProfile(contractName) {
|
||||
return {
|
||||
type: FETCH_CONTRACT_PROFILE,
|
||||
contractName
|
||||
};
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
export const CONTRACTS = createRequestTypes('CONTRACTS');
|
||||
export const contracts = {
|
||||
request: () => action(CONTRACTS[REQUEST]),
|
||||
|
@ -148,4 +134,4 @@ export const messageListen = {
|
|||
request: (channel) => action(MESSAGE_LISTEN[REQUEST], {channel}),
|
||||
success: (message) => action(MESSAGE_LISTEN[SUCCESS], {message}),
|
||||
failure: (error) => action(MESSAGE_LISTEN[FAILURE], {error})
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue